From d82bb3fde8afc5e4708cc5c91a7ba8041c680898 Mon Sep 17 00:00:00 2001 From: Matt Dallmeyer Date: Mon, 9 Sep 2024 20:26:46 -0700 Subject: [PATCH] Fix github release-pipeline so version tag is available for cmake (#3651) Followup to https://discord.com/channels/756287461377703987/1280601431975661599 where the v0.2.16 release is showing git SHA in the speedrun verification text, instead of the version tag --- .github/workflows/linux-build-clang.yaml | 10 ++++++++++ .github/workflows/macos-build.yaml | 10 ++++++++++ .github/workflows/release-pipeline.yaml | 6 ++++++ .github/workflows/windows-build-clang.yaml | 10 ++++++++++ 4 files changed, 36 insertions(+) diff --git a/.github/workflows/linux-build-clang.yaml b/.github/workflows/linux-build-clang.yaml index 7c5ef3be1..df8a0f945 100644 --- a/.github/workflows/linux-build-clang.yaml +++ b/.github/workflows/linux-build-clang.yaml @@ -21,9 +21,19 @@ jobs: timeout-minutes: 60 steps: + # minimal checkout if we're NOT uploading artifacts - name: Checkout Repository + if: ${{ ! inputs.uploadArtifacts }} uses: actions/checkout@v4 + # full checkout with tags if we ARE uploading artifacts + - name: Checkout Repository with Tags + if: ${{ inputs.uploadArtifacts }} + uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true + - name: Install Package Dependencies run: | sudo apt update diff --git a/.github/workflows/macos-build.yaml b/.github/workflows/macos-build.yaml index 7792e2b71..4ee2097f7 100644 --- a/.github/workflows/macos-build.yaml +++ b/.github/workflows/macos-build.yaml @@ -21,9 +21,19 @@ jobs: timeout-minutes: 120 steps: + # minimal checkout if we're NOT uploading artifacts - name: Checkout Repository + if: ${{ ! inputs.uploadArtifacts }} uses: actions/checkout@v4 + # full checkout with tags if we ARE uploading artifacts + - name: Checkout Repository with Tags + if: ${{ inputs.uploadArtifacts }} + uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true + - name: Install Package Dependencies run: brew install cmake nasm ninja diff --git a/.github/workflows/release-pipeline.yaml b/.github/workflows/release-pipeline.yaml index dcd7a65e5..d1aa0244f 100644 --- a/.github/workflows/release-pipeline.yaml +++ b/.github/workflows/release-pipeline.yaml @@ -45,6 +45,8 @@ jobs: # Windows build_windows_clang: + needs: + - cut_release name: "🖥️ Windows" uses: ./.github/workflows/windows-build-clang.yaml with: @@ -55,6 +57,8 @@ jobs: # Linux build_linux_clang: + needs: + - cut_release name: "🐧 Linux" uses: ./.github/workflows/linux-build-clang.yaml with: @@ -65,6 +69,8 @@ jobs: # macOS build_macos_intel: + needs: + - cut_release name: "🍎 MacOS" uses: ./.github/workflows/macos-build.yaml with: diff --git a/.github/workflows/windows-build-clang.yaml b/.github/workflows/windows-build-clang.yaml index fce72a4ad..30aa2de59 100644 --- a/.github/workflows/windows-build-clang.yaml +++ b/.github/workflows/windows-build-clang.yaml @@ -22,9 +22,19 @@ jobs: timeout-minutes: 60 steps: + # minimal checkout if we're NOT uploading artifacts - name: Checkout Repository + if: ${{ ! inputs.uploadArtifacts }} uses: actions/checkout@v4 + # full checkout with tags if we ARE uploading artifacts + - name: Checkout Repository with Tags + if: ${{ inputs.uploadArtifacts }} + uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true + - name: Install NASM # TODO - Simplify this with just the first command once choco 2.0 rolls out everywhere run: |