From f8155a217d3fb57523fc429e279a2b24d8b8cc1a Mon Sep 17 00:00:00 2001 From: meisnate12 Date: Wed, 29 May 2024 17:07:43 -0400 Subject: [PATCH] [31] Fix Double Build (#2082) --- .github/pull_request_template.md | 5 +- .github/workflows/docker-nightly.yml | 121 --------------------------- .github/workflows/version.yml | 115 +++++++++++++++++++++++++ VERSION | 2 +- 4 files changed, 120 insertions(+), 123 deletions(-) delete mode 100644 .github/workflows/docker-nightly.yml diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 87118b94..7304ed07 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -18,4 +18,7 @@ Please delete options that are not relevant. ## Checklist -- [] My code was submitted to the nightly branch of the repository. +Please delete options that are not relevant. + +- [] Updated Documentation to reflect changes +- [] Updated the CHANGELOG with the changes diff --git a/.github/workflows/docker-nightly.yml b/.github/workflows/docker-nightly.yml deleted file mode 100644 index a72045d5..00000000 --- a/.github/workflows/docker-nightly.yml +++ /dev/null @@ -1,121 +0,0 @@ -name: Docker Nightly Release - -on: - push: - branches: [ nightly ] - -jobs: - - verify-changes: - runs-on: ubuntu-latest - outputs: - build: ${{ steps.list-changes.outputs.build }} - steps: - - - name: Check Out Repo - uses: actions/checkout@v4 - with: - fetch-depth: 0 - ref: nightly - - - name: Get changes - id: get-changes - run: echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT - - - name: List changed files - id: list-changes - run: | - for file in ${{ steps.get-changes.outputs.files }}; do - if [[ $file =~ ^(defaults|fonts|modules|kometa.py|requirements.txt|.dockerignore|Dockerfile).*$ ]] ; then - echo "$file will trigger docker build" - echo "build=true" >> $GITHUB_OUTPUT - else - echo "$file will not trigger docker build" - fi - done - - docker-build: - runs-on: ubuntu-latest - needs: [ verify-changes ] - if: needs.verify-changes.outputs.build == 'true' - steps: - - - name: Check Out Repo - uses: actions/checkout@v4 - with: - ref: nightly - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@master - with: - platforms: all - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3 - - - name: Build and Push - id: docker_build - uses: docker/build-push-action@v5 - with: - context: ./ - file: ./Dockerfile - build-args: | - "BRANCH_NAME=nightly" - platforms: linux/amd64,linux/arm64 - push: true - tags: kometateam/kometa:nightly - cache-from: type=gha - cache-to: type=gha,mode=max - - - name: Discord Success Notification - uses: Kometa-Team/discord-notifications@master - if: success() - with: - webhook_id_token: ${{ secrets.BUILD_WEBHOOK }} - title: "${{ vars.REPO_NAME }} nightly: ${{ vars.TEXT_SUCCESS }}" - url: https://github.com/Kometa-Team/${{ vars.REPO_NAME }}/actions/runs/${{ github.run_id }} - color: ${{ vars.COLOR_SUCCESS }} - username: ${{ vars.BOT_NAME }} - avatar_url: ${{ vars.BOT_IMAGE }} - author: ${{ vars.DOCKER_NAME }} - author_icon_url: ${{ vars.DOCKER_IMAGE }} - - - name: Discord Failure Notification - uses: Kometa-Team/discord-notifications@master - if: failure() - with: - webhook_id_token: ${{ secrets.BUILD_WEBHOOK }} - message: ${{ vars.BUILD_FAILURE_ROLE }} - title: "${{ vars.REPO_NAME }} nightly: ${{ vars.TEXT_FAILURE }}" - url: https://github.com/Kometa-Team/${{ vars.REPO_NAME }}/actions/runs/${{ github.run_id }} - color: ${{ vars.COLOR_FAILURE }} - username: ${{ vars.BOT_NAME }} - avatar_url: ${{ vars.BOT_IMAGE }} - author: ${{ vars.DOCKER_NAME }} - author_icon_url: ${{ vars.DOCKER_IMAGE }} - - commit-notification: - runs-on: ubuntu-latest - needs: [ docker-build, verify-changes ] - if: ${{ success() && needs.verify-changes.outputs.build == 'true' }} - steps: - - - name: Send Discord Commit Notification - uses: Kometa-Team/discord-notifications@master - with: - webhook_id_token: ${{ secrets.NIGHTLY_WEBHOOK }} - title: ${{ vars.TEXT_COMMITS }} - message: "<@&967002147520675840> - An update to Kometa has now been published and is available to users of the **nightly** branch." - commits: "true" - color: ${{ vars.COLOR_SUCCESS }} - username: ${{ vars.BOT_NAME }} - avatar_url: ${{ vars.BOT_IMAGE }} - author: ${{ vars.REPO_NAME }} Nightly Release - author_icon_url: ${{ vars.RELEASE_IMAGE }} diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 38c18da9..e516ad58 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -48,3 +48,118 @@ jobs: git add VERSION git commit -m "${new_msg}" --amend git push origin nightly --force-with-lease + + verify-changes: + runs-on: ubuntu-latest + needs: [ increment-version ] + outputs: + build: ${{ steps.list-changes.outputs.build }} + steps: + + - name: Check Out Repo + uses: actions/checkout@v4 + with: + fetch-depth: 0 + ref: nightly + + - name: Get changes + id: get-changes + run: echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT + + - name: List changed files + id: list-changes + run: | + for file in ${{ steps.get-changes.outputs.files }}; do + if [[ $file =~ ^(defaults|fonts|modules|kometa.py|requirements.txt|.dockerignore|Dockerfile).*$ ]] ; then + echo "$file will trigger docker build" + echo "build=true" >> $GITHUB_OUTPUT + else + echo "$file will not trigger docker build" + fi + done + + docker-build: + runs-on: ubuntu-latest + needs: [ verify-changes ] + if: needs.verify-changes.outputs.build == 'true' + steps: + + - name: Check Out Repo + uses: actions/checkout@v4 + with: + ref: nightly + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + + - name: Set up QEMU + uses: docker/setup-qemu-action@master + with: + platforms: all + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v3 + + - name: Build and Push + id: docker_build + uses: docker/build-push-action@v5 + with: + context: ./ + file: ./Dockerfile + build-args: | + "BRANCH_NAME=nightly" + platforms: linux/amd64,linux/arm64 + push: true + tags: kometateam/kometa:nightly + cache-from: type=gha + cache-to: type=gha,mode=max + + - name: Discord Success Notification + uses: Kometa-Team/discord-notifications@master + if: success() + with: + webhook_id_token: ${{ secrets.BUILD_WEBHOOK }} + title: "${{ vars.REPO_NAME }} nightly: ${{ vars.TEXT_SUCCESS }}" + url: https://github.com/Kometa-Team/${{ vars.REPO_NAME }}/actions/runs/${{ github.run_id }} + color: ${{ vars.COLOR_SUCCESS }} + username: ${{ vars.BOT_NAME }} + avatar_url: ${{ vars.BOT_IMAGE }} + author: ${{ vars.DOCKER_NAME }} + author_icon_url: ${{ vars.DOCKER_IMAGE }} + + - name: Discord Failure Notification + uses: Kometa-Team/discord-notifications@master + if: failure() + with: + webhook_id_token: ${{ secrets.BUILD_WEBHOOK }} + message: ${{ vars.BUILD_FAILURE_ROLE }} + title: "${{ vars.REPO_NAME }} nightly: ${{ vars.TEXT_FAILURE }}" + url: https://github.com/Kometa-Team/${{ vars.REPO_NAME }}/actions/runs/${{ github.run_id }} + color: ${{ vars.COLOR_FAILURE }} + username: ${{ vars.BOT_NAME }} + avatar_url: ${{ vars.BOT_IMAGE }} + author: ${{ vars.DOCKER_NAME }} + author_icon_url: ${{ vars.DOCKER_IMAGE }} + + commit-notification: + runs-on: ubuntu-latest + needs: [ docker-build, verify-changes ] + if: ${{ success() && needs.verify-changes.outputs.build == 'true' }} + steps: + + - name: Send Discord Commit Notification + uses: Kometa-Team/discord-notifications@master + with: + webhook_id_token: ${{ secrets.NIGHTLY_WEBHOOK }} + title: ${{ vars.TEXT_COMMITS }} + message: "<@&967002147520675840> - An update to Kometa has now been published and is available to users of the **nightly** branch." + commits: "true" + color: ${{ vars.COLOR_SUCCESS }} + username: ${{ vars.BOT_NAME }} + avatar_url: ${{ vars.BOT_IMAGE }} + author: ${{ vars.REPO_NAME }} Nightly Release + author_icon_url: ${{ vars.RELEASE_IMAGE }} diff --git a/VERSION b/VERSION index 322153f9..dc8e7cf0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ --build1 +2.0.1-build31