From 59719f15f79436671266ab102bcc7462bf827b43 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 21 May 2024 21:35:12 -0400 Subject: [PATCH] ci: use prerelease logic --- .github/workflows/ci-docker.yml | 44 +++++++++++++++++++-------------- .github/workflows/ci.yml | 23 +++++++++-------- 2 files changed, 39 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index e3ab766..03f909c 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -29,7 +29,7 @@ on: workflow_dispatch: concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: "${{ github.workflow }}-${{ github.ref }}" cancel-in-progress: true jobs: @@ -74,9 +74,27 @@ jobs: echo $matrix | jq . echo "matrix=$matrix" >> $GITHUB_OUTPUT + - name: Find dotnet solution file + id: find_dotnet + run: | + solution=$(find . -maxdepth 1 -type f -iname "*.sln") + + echo "found solution: ${solution}" + + # do not quote to keep this as a single line + echo solution=${solution} >> $GITHUB_OUTPUT + + if [[ $solution != "" ]]; then + echo "dotnet=true" >> $GITHUB_OUTPUT + else + echo "dotnet=false" >> $GITHUB_OUTPUT + fi + outputs: dockerfiles: ${{ steps.find.outputs.dockerfiles }} matrix: ${{ steps.find.outputs.matrix }} + dotnet: ${{ steps.find_dotnet.outputs.dotnet }} + solution: ${{ steps.find_dotnet.outputs.solution }} setup_release: if: ${{ needs.check_dockerfiles.outputs.dockerfiles }} @@ -84,19 +102,9 @@ jobs: needs: - check_dockerfiles outputs: - changelog_changes: ${{ steps.setup_release.outputs.changelog_changes }} - changelog_date: ${{ steps.setup_release.outputs.changelog_date }} - changelog_exists: ${{ steps.setup_release.outputs.changelog_exists }} - changelog_release_exists: ${{ steps.setup_release.outputs.changelog_release_exists }} - changelog_url: ${{ steps.setup_release.outputs.changelog_url }} - changelog_version: ${{ steps.setup_release.outputs.changelog_version }} - publish_pre_release: ${{ steps.setup_release.outputs.publish_pre_release }} publish_release: ${{ steps.setup_release.outputs.publish_release }} - publish_stable_release: ${{ steps.setup_release.outputs.publish_stable_release }} - release_body: ${{ steps.setup_release.outputs.release_body }} release_build: ${{ steps.setup_release.outputs.release_build }} release_commit: ${{ steps.setup_release.outputs.release_commit }} - release_generate_release_notes: ${{ steps.setup_release.outputs.release_generate_release_notes }} release_tag: ${{ steps.setup_release.outputs.release_tag }} release_version: ${{ steps.setup_release.outputs.release_version }} runs-on: ubuntu-latest @@ -106,8 +114,9 @@ jobs: - name: Setup Release id: setup_release - uses: LizardByte/setup-release-action@v2024.419.10846 + uses: LizardByte/setup-release-action@v2024.520.181643 with: + dotnet: ${{ needs.check_dockerfiles.outputs.dotnet }} github_token: ${{ secrets.GITHUB_TOKEN }} lint_dockerfile: @@ -152,7 +161,7 @@ jobs: steps: - name: Maximize build space - uses: easimon/maximize-build-space@v8 + uses: easimon/maximize-build-space@v10 with: root-reserve-mb: 30720 # https://github.com/easimon/maximize-build-space#caveats remove-dotnet: 'true' @@ -268,7 +277,7 @@ jobs: id: buildx - name: Cache Docker Layers - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /tmp/.buildx-cache key: Docker-buildx${{ matrix.tag }}-${{ github.sha }} @@ -354,21 +363,20 @@ jobs: - name: Create/Update GitHub Release if: ${{ needs.setup_release.outputs.publish_release == 'true' && steps.prepare.outputs.artifacts == 'true' }} - uses: LizardByte/create-release-action@v2023.1219.224026 + uses: LizardByte/create-release-action@v2024.520.180003 with: allowUpdates: true artifacts: "*artifacts/*" - body: '' discussionCategory: announcements generateReleaseNotes: true name: ${{ needs.setup_release.outputs.release_tag }} - prerelease: ${{ needs.setup_release.outputs.publish_pre_release }} + prerelease: true tag: ${{ needs.setup_release.outputs.release_tag }} token: ${{ secrets.GH_BOT_TOKEN }} - name: Update Docker Hub Description if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - uses: peter-evans/dockerhub-description@v3 + uses: peter-evans/dockerhub-description@v4 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} # token is not currently supported diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30ca8bf..b74676f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,18 +9,28 @@ on: branches: [master] workflow_dispatch: +concurrency: + group: "${{ github.workflow }}-${{ github.ref }}" + cancel-in-progress: true + jobs: build: name: Build runs-on: ubuntu-latest steps: + - name: Setup Release + id: setup_release + uses: LizardByte/setup-release-action@v2024.520.193857 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + - name: Checkout uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: "3.11" - name: Install Python Dependencies run: | @@ -59,24 +69,17 @@ jobs: fail_ci_if_error: true token: ${{ secrets.CODECOV_TOKEN }} - - name: Setup Release - id: setup_release - uses: LizardByte/setup-release-action@v2024.419.10846 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - - name: Create/Update GitHub Release if: >- (github.event_name == 'push' && github.ref == 'refs/heads/master') && steps.setup_release.outputs.publish_release == 'true' - uses: LizardByte/create-release-action@v2023.1219.224026 + uses: LizardByte/create-release-action@v2024.520.193838 with: allowUpdates: true artifacts: "" - body: '' discussionCategory: announcements generateReleaseNotes: true name: ${{ steps.setup_release.outputs.release_tag }} - prerelease: ${{ steps.setup_release.outputs.publish_pre_release }} + prerelease: true tag: ${{ steps.setup_release.outputs.release_tag }} token: ${{ secrets.GH_BOT_TOKEN }}