diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index d6b3abc11..759462d01 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -259,19 +259,21 @@ jobs: build-fedora, build-rhel ] + outputs: + version: ${{ steps.getversion.outputs.version }} steps: - name: Checkout source code uses: actions/checkout@v3 - name: Get VERSION id: getversion - run: echo "::set-output name=version::$(cat src/VERSION | tr -d '\n')" + run: echo "version=$(cat src/VERSION | tr -d '\n')" >> "$GITHUB_OUTPUT" # Push Docker images push-bunkerweb: needs: [wait-builds] uses: ./.github/workflows/push-docker.yml with: - IMAGE: bunkerity/bunkerweb:beta,bunkerity/bunkerweb:${{ jobs.wait-builds.steps.getversion.outputs.version }} + IMAGE: bunkerity/bunkerweb:beta,bunkerity/bunkerweb:${{ needs.wait-builds.outputs.version }} CACHE_FROM: bunkerweb-beta DOCKERFILE: src/bw/Dockerfile secrets: @@ -283,7 +285,7 @@ jobs: needs: [wait-builds] uses: ./.github/workflows/push-docker.yml with: - IMAGE: bunkerity/bunkerweb-scheduler:beta,bunkerity/bunkerweb-scheduler:${{ jobs.wait-builds.steps.getversion.outputs.version }} + IMAGE: bunkerity/bunkerweb-scheduler:beta,bunkerity/bunkerweb-scheduler:${{ needs.wait-builds.outputs.version }} CACHE_FROM: scheduler-beta DOCKERFILE: src/scheduler/Dockerfile secrets: @@ -295,7 +297,7 @@ jobs: needs: [wait-builds] uses: ./.github/workflows/push-docker.yml with: - IMAGE: bunkerity/bunkerweb-autoconf:beta,bunkerity/bunkerweb-autoconf:${{ jobs.wait-builds.steps.getversion.outputs.version }} + IMAGE: bunkerity/bunkerweb-autoconf:beta,bunkerity/bunkerweb-autoconf:${{ needs.wait-builds.outputs.version }} CACHE_FROM: autoconf-beta DOCKERFILE: src/autoconf/Dockerfile secrets: @@ -307,7 +309,7 @@ jobs: needs: [wait-builds] uses: ./.github/workflows/push-docker.yml with: - IMAGE: bunkerity/bunkerweb-ui:beta,bunkerity/bunkerweb-ui:${{ jobs.wait-builds.steps.getversion.outputs.version }} + IMAGE: bunkerity/bunkerweb-ui:beta,bunkerity/bunkerweb-ui:${{ needs.wait-builds.outputs.version }} CACHE_FROM: ui-beta DOCKERFILE: src/ui/Dockerfile secrets: @@ -327,7 +329,7 @@ jobs: LINUX: ubuntu VERSION: jammy PACKAGE: deb - BW_VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + BW_VERSION: ${{ needs.wait-builds.outputs.version }} secrets: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} push-debian: @@ -340,7 +342,7 @@ jobs: LINUX: debian VERSION: bullseye PACKAGE: deb - BW_VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + BW_VERSION: ${{ needs.wait-builds.outputs.version }} secrets: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} push-rhel: @@ -353,7 +355,7 @@ jobs: LINUX: el VERSION: 8 PACKAGE: rpm - BW_VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + BW_VERSION: ${{ needs.wait-builds.outputs.version }} secrets: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} push-fedora: @@ -366,13 +368,14 @@ jobs: LINUX: fedora VERSION: 37 PACKAGE: rpm - BW_VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + BW_VERSION: ${{ needs.wait-builds.outputs.version }} secrets: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} # Create doc PDF doc-pdf: needs: [ + wait-builds, push-bunkerweb, push-scheduler, push-autoconf, @@ -384,26 +387,26 @@ jobs: ] uses: ./.github/workflows/doc-to-pdf.yml with: - VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + VERSION: ${{ needs.wait-builds.outputs.version }} # Push on GH push-gh: - needs: [doc-pdf] + needs: [wait-builds, doc-pdf] permissions: contents: write uses: ./.github/workflows/push-github.yml with: - VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + VERSION: ${{ needs.wait-builds.outputs.version }} PRERELEASE: true # Push doc push-doc: - needs: [push-gh] + needs: [wait-builds, push-gh] permissions: contents: write uses: ./.github/workflows/push-doc.yml with: - VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + VERSION: ${{ needs.wait-builds.outputs.version }} ALIAS: beta diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96fd4be52..959bfe0f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -235,19 +235,21 @@ jobs: build-fedora, build-rhel ] + outputs: + version: ${{ steps.getversion.outputs.version }} steps: - name: Checkout source code uses: actions/checkout@v3 - name: Get VERSION id: getversion - run: echo "::set-output name=version::$(cat src/VERSION | tr -d '\n')" + run: echo "version=$(cat src/VERSION | tr -d '\n')" >> "$GITHUB_OUTPUT" # Push Docker images push-bunkerweb: needs: [wait-builds] uses: ./.github/workflows/push-docker.yml with: - IMAGE: bunkerity/bunkerweb:latest,bunkerity/bunkerweb:${{ jobs.wait-builds.steps.getversion.outputs.version }} + IMAGE: bunkerity/bunkerweb:latest,bunkerity/bunkerweb:${{ needs.wait-builds.outputs.version }} CACHE_FROM: bunkerweb-latest DOCKERFILE: src/bw/Dockerfile secrets: @@ -259,7 +261,7 @@ jobs: needs: [wait-builds] uses: ./.github/workflows/push-docker.yml with: - IMAGE: bunkerity/bunkerweb-scheduler:latest,bunkerity/bunkerweb-scheduler:${{ jobs.wait-builds.steps.getversion.outputs.version }} + IMAGE: bunkerity/bunkerweb-scheduler:latest,bunkerity/bunkerweb-scheduler:${{ needs.wait-builds.outputs.version }} CACHE_FROM: scheduler-latest DOCKERFILE: src/scheduler/Dockerfile secrets: @@ -271,7 +273,7 @@ jobs: needs: [wait-builds] uses: ./.github/workflows/push-docker.yml with: - IMAGE: bunkerity/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:${{ jobs.wait-builds.steps.getversion.outputs.version }} + IMAGE: bunkerity/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:${{ needs.wait-builds.outputs.version }} CACHE_FROM: autoconf-latest DOCKERFILE: src/autoconf/Dockerfile secrets: @@ -283,7 +285,7 @@ jobs: needs: [wait-builds] uses: ./.github/workflows/push-docker.yml with: - IMAGE: bunkerity/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:${{ jobs.wait-builds.steps.getversion.outputs.version }} + IMAGE: bunkerity/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:${{ needs.wait-builds.outputs.version }} CACHE_FROM: ui-latest DOCKERFILE: src/ui/Dockerfile secrets: @@ -303,7 +305,7 @@ jobs: LINUX: ubuntu VERSION: jammy PACKAGE: deb - BW_VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + BW_VERSION: ${{ needs.wait-builds.outputs.version }} secrets: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} push-debian: @@ -316,7 +318,7 @@ jobs: LINUX: debian VERSION: bullseye PACKAGE: deb - BW_VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + BW_VERSION: ${{ needs.wait-builds.outputs.version }} secrets: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} push-rhel: @@ -329,7 +331,7 @@ jobs: LINUX: el VERSION: 8 PACKAGE: rpm - BW_VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + BW_VERSION: ${{ needs.wait-builds.outputs.version }} secrets: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} push-fedora: @@ -342,13 +344,14 @@ jobs: LINUX: fedora VERSION: 37 PACKAGE: rpm - BW_VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + BW_VERSION: ${{ needs.wait-builds.outputs.version }} secrets: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} # Create doc PDF doc-pdf: needs: [ + wait-builds, push-bunkerweb, push-scheduler, push-autoconf, @@ -360,26 +363,26 @@ jobs: ] uses: ./.github/workflows/doc-to-pdf.yml with: - VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + VERSION: ${{ needs.wait-builds.outputs.version }} # Push on GH push-gh: - needs: [doc-pdf] + needs: [wait-builds, doc-pdf] permissions: contents: write uses: ./.github/workflows/push-github.yml with: - VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + VERSION: ${{ needs.wait-builds.outputs.version }} PRERELEASE: false # Push doc push-doc: - needs: [push-gh] + needs: [wait-builds, push-gh] permissions: contents: write uses: ./.github/workflows/push-doc.yml with: - VERSION: ${{ jobs.wait-builds.steps.getversion.outputs.version }} + VERSION: ${{ needs.wait-builds.outputs.version }} ALIAS: latest # Update Docker Hub description @@ -399,9 +402,6 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} - - name: Extract changelog - id: getchangelog - run: echo "::set-output name=content::$(awk -v n=2 '/##/{n--}; n > 0' CHANGELOG.md | grep -v '# Changelog' | grep -v '##' | sed '/^$/d')" - name: Update Docker Hub description for BW uses: peter-evans/dockerhub-description@v3 with: