diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c9ddc4d0b588..46371339c431 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -50,9 +50,6 @@ jobs: outputs: version: ${{ steps.version.outputs.result }} steps: - - name: Check if updates are needed - if: needs.get_diff.outputs.package_diff != '0' && needs.get_diff.outputs.compose_diff != '0' - run: exit 0 - name: Checkout uses: actions/checkout@v3 @@ -106,6 +103,7 @@ jobs: yq -r eval '.services.web.image = "ghcr.io/${{ github.repository }}:${{ steps.version.outputs.result }}"' -i "${{ github.workspace }}/docker-compose.yml" - name: Commit and Push + if: needs.get_diff.outputs.package_diff == '0' || needs.get_diff.outputs.compose_diff == '0' run: | git config user.name github-actions[bot] git config user.email github-actions[bot]@users.noreply.github.com @@ -130,6 +128,16 @@ jobs: with: ref: ${{ github.head_ref }} + - name: merge PR + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: gh pr merge ${{ github.event.pull_request.number }} --merge + + - name: Checkout release branch + uses: actions/checkout@v3 + with: + ref: ${{ github.base_ref }} + - name: Get changelog title id: get_changelog_title run: echo "changelog_title=${{ needs.update_version.outputs.version }} ($(date "+%Y/%m/%d"))" >> $GITHUB_OUTPUT @@ -163,24 +171,8 @@ jobs: git config user.email github-actions[bot]@users.noreply.github.com git add . git commit --author=. -m "update CHANGELOG.md" - git push - - - name: merge PR - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: gh pr merge ${{ github.event.pull_request.number }} --merge - - - name: Checkout release branch - uses: actions/checkout@v3 - with: - ref: ${{ github.base_ref }} - - - name: Commit and Push - run: | - git config user.name github-actions[bot] - git config user.email github-actions[bot]@users.noreply.github.com git tag "${{ needs.update_version.outputs.version }}" - git push --tags + git push --follow-tags - name: Release uses: softprops/action-gh-release@v1 diff --git a/docker-compose.yml b/docker-compose.yml index 047d8dc38b4e..ec90587e72b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,4 @@ version: "3" - services: web: image: ghcr.io/taiyme/misskey:12.119.2-taiyme-v1.0.40 @@ -15,7 +14,6 @@ services: depends_on: - db - redis - redis: restart: always image: redis:4.0-alpine @@ -23,7 +21,6 @@ services: - internal_network volumes: - ./redis:/data - db: restart: always image: postgres:12.2-alpine @@ -33,7 +30,6 @@ services: - .config/docker.env volumes: - ./db:/var/lib/postgresql/data - networks: internal_network: internal: true