diff --git a/.github/workflows/check_copyright_year.yml b/.github/workflows/check_copyright_year.yml index 8daea44a83..ecb487ace3 100644 --- a/.github/workflows/check_copyright_year.yml +++ b/.github/workflows/check_copyright_year.yml @@ -3,8 +3,8 @@ name: Check copyright year on: push: branches: - - master - - develop + - art/main + - art/dev jobs: check_copyright_year: diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index 09a2c33e0c..56b2f0a11c 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -3,12 +3,18 @@ name: Publish Docker image (develop) on: push: branches: - - develop + - art/dev workflow_dispatch: +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + jobs: push_to_registry: name: Push Docker image to Docker Hub + permissions: + packages: write runs-on: ubuntu-latest if: github.repository == 'misskey-dev/misskey' steps: @@ -23,12 +29,14 @@ jobs: id: meta uses: docker/metadata-action@v4 with: - images: misskey/misskey - - name: Log in to Docker Hub + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Log in to the Container registry uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build and Push to Docker Hub uses: docker/build-push-action@v4 with: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a465d92eaf..046006bdf6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,9 +5,15 @@ on: types: [published] workflow_dispatch: +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + jobs: push_to_registry: name: Push Docker image to Docker Hub + permissions: + packages: write runs-on: ubuntu-latest steps: @@ -22,7 +28,7 @@ jobs: id: meta uses: docker/metadata-action@v4 with: - images: misskey/misskey + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | type=edge type=ref,event=pr @@ -30,11 +36,13 @@ jobs: type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} - - name: Log in to Docker Hub + - name: Log in to the Container registry uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build and Push to Docker Hub uses: docker/build-push-action@v4 with: diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml index 9b79ee54f0..b31ff5ad7c 100644 --- a/.github/workflows/dockle.yml +++ b/.github/workflows/dockle.yml @@ -4,8 +4,8 @@ name: Dockle on: push: branches: - - master - - develop + - art/main + - art/dev pull_request: jobs: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0f3702f958..ca34626e78 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,8 +3,8 @@ name: Lint on: push: branches: - - master - - develop + - art/main + - art/dev pull_request: jobs: diff --git a/.github/workflows/reviewer_lottery.yml b/.github/workflows/reviewer_lottery.yml deleted file mode 100644 index 33228d7465..0000000000 --- a/.github/workflows/reviewer_lottery.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: "Reviewer lottery" -on: - pull_request_target: - types: [opened, ready_for_review, reopened] - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - uses: uesteibar/reviewer-lottery@v2 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml index d7be15bd4f..4f9f76ec87 100644 --- a/.github/workflows/test-backend.yml +++ b/.github/workflows/test-backend.yml @@ -3,8 +3,8 @@ name: Test (backend) on: push: branches: - - master - - develop + - art/main + - art/dev pull_request: jobs: diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml index 4ea4ba4628..3fc487b48a 100644 --- a/.github/workflows/test-frontend.yml +++ b/.github/workflows/test-frontend.yml @@ -3,8 +3,8 @@ name: Test (frontend) on: push: branches: - - master - - develop + - art/main + - art/dev pull_request: jobs: diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml index b15e704c7f..c7fd97b69c 100644 --- a/.github/workflows/test-misskey-js.yml +++ b/.github/workflows/test-misskey-js.yml @@ -5,9 +5,9 @@ name: Test (misskey.js) on: push: - branches: [ develop ] + branches: [ art/dev ] pull_request: - branches: [ develop ] + branches: [ art/dev ] jobs: test: diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml index 5243a83777..28e5c4fc29 100644 --- a/.github/workflows/test-production.yml +++ b/.github/workflows/test-production.yml @@ -3,8 +3,8 @@ name: Test (production install and build) on: push: branches: - - master - - develop + - art/main + - art/dev pull_request: env: