diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 055a0bb5f..b6f2e7879 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,9 +51,10 @@ jobs: - name: Set build date run: | - SHORT_SHA=$(git rev-parse --short HEAD) - BUILD_VERSION=$(date +'%Y-%b-%d_%H-%M-%S')_$SHORT_SHA - echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_ENV + SHORT_SHA=$(git rev-parse --short HEAD) + BUILD_DATE=$(date +'%Y-%b-%d_%H-%M-%S') + BUILD_VERSION="${SHORT_SHA}_${BUILD_DATE}" + echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_ENV - name: Install Dependencies run: | @@ -176,13 +177,13 @@ jobs: mkdir -p artifacts/shaders cp ./shaders/*.spv artifacts/shaders/ cd artifacts - tar -zcvf "../Nightly_${{ env.BUILD_VERSION}}_Linux_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.tar.xz" * + tar -zcvf "../Nightly_Linux_${{ matrix.config.compiler }}_${{ matrix.config.build_type }}_${{ env.BUILD_VERSION}}.tar.xz" * - name: Upload Nightly Artifacts uses: actions/upload-artifact@v4 with: - name: Nightly_${{ env.BUILD_VERSION}}_Linux_${{ matrix.config.build_type }}_${{ matrix.config.compiler }} - path: Nightly_${{ env.BUILD_VERSION}}_Linux_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.tar.xz + name: Nightly_Linux_${{ matrix.config.compiler }}_${{ matrix.config.build_type }}_${{ env.BUILD_VERSION}} + path: Nightly_Linux_${{ matrix.config.compiler }}_${{ matrix.config.build_type }}_${{ env.BUILD_VERSION}}.tar.xz retention-days: 60 windows: @@ -238,9 +239,10 @@ jobs: - name: Set Build Date run: | - $shortSha = git rev-parse --short HEAD - $buildDate = (Get-Date -Format 'yyyy-MMM-dd_HH-mm-ss') + "_$shortSha" - echo "BUILD_VERSION=$buildDate" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + $shortSha = git rev-parse --short HEAD + $buildDate = Get-Date -Format 'yyyy-MMM-dd_HH-mm-ss' + $buildVersion = "${shortSha}_$buildDate" + echo "BUILD_VERSION=$buildVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Check Cache for Vulkan SDK id: cache-vulkan @@ -333,11 +335,11 @@ jobs: mkdir artifacts/shaders Copy-Item -Path ./shaders/*.spv -Destination artifacts/shaders # Create nightly archive - 7z a -tzip "Nightly_${{ env.BUILD_VERSION}}_Windows_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.zip" ./artifacts/* + 7z a -tzip "Nightly_Windows_${{ matrix.config.compiler }}_${{ matrix.config.build_type }}_${{ env.BUILD_VERSION}}.zip" ./artifacts/* - name: Upload Nightly Artifacts uses: actions/upload-artifact@v4 with: - name: Nightly_${{ env.BUILD_VERSION}}_Windows_${{ matrix.config.build_type }}_${{ matrix.config.compiler }} - path: Nightly_${{ env.BUILD_VERSION}}_Windows_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}.zip + name: Nightly_Windows_${{ matrix.config.compiler }}_${{ matrix.config.build_type }}_${{ env.BUILD_VERSION}} + path: Nightly_Windows_${{ matrix.config.compiler }}_${{ matrix.config.build_type }}_${{ env.BUILD_VERSION}}.zip retention-days: 60 diff --git a/.github/workflows/build_documentation.yml b/.github/workflows/build_documentation.yml index ddb393f77..53f989d6a 100644 --- a/.github/workflows/build_documentation.yml +++ b/.github/workflows/build_documentation.yml @@ -2,8 +2,10 @@ name: Build Documentation on: push: + branches: + - main pull_request: - types: [opened] + types: [opened, synchronize, reopened] # Cancel CI workflows which are still running from previous pushes concurrency: @@ -14,7 +16,6 @@ jobs: build_documentation: name: Build Documentation runs-on: ubuntu-latest - if: ${{ github.event_name == 'pull_request' && github.event.action == 'opened' && !github.event.pull_request.merged || github.event_name == 'push' }} steps: - name: Update environment run: | @@ -26,9 +27,10 @@ jobs: - name: Set build date run: | - SHORT_SHA=$(git rev-parse --short HEAD) - BUILD_VERSION=$(date +'%Y-%b-%d_%H-%M-%S')_$SHORT_SHA - echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_ENV + SHORT_SHA=$(git rev-parse --short HEAD) + BUILD_DATE=$(date +'%Y-%b-%d_%H-%M-%S') + BUILD_VERSION="${SHORT_SHA}_${BUILD_DATE}" + echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_ENV - name: Configure CMake working-directory: ${{ github.workspace }}/documentation @@ -49,12 +51,12 @@ jobs: - name: Prepare artifacts working-directory: ${{ github.workspace }}/documentation run: | - ZIP_NAME=Nightly_${BUILD_VERSION}_Documentation.zip + ZIP_NAME=Nightly_Documentation_${BUILD_VERSION}.zip zip -r "$ZIP_NAME" build/html - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: Nightly_${{ env.BUILD_VERSION}}_Documentation - path: ${{ github.workspace }}/documentation/Nightly_${{ env.BUILD_VERSION}}_Documentation.zip + name: Nightly_Documentation_${{ env.BUILD_VERSION}} + path: ${{ github.workspace }}/documentation/Nightly_Documentation_${{ env.BUILD_VERSION}}.zip retention-days: 60 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3662f680f..2c5654bf2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -112,8 +112,9 @@ jobs: run: | gh release delete nightly -y || true - FILES=$(find ./archives -type f -print0 | xargs -0) - echo "Uploading files:" + # Find all files, sort them alphabetically, and flatten into a single line + FILES=$(find ./archives -type f | sort | tr '\n' ' ') + echo "Uploading files in sorted order:" echo "$FILES" gh release create nightly $FILES \ diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index 6dc582aea..3e40980f0 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -26,9 +26,10 @@ jobs: - name: Set build date run: | - SHORT_SHA=$(git rev-parse --short HEAD) - BUILD_VERSION=$(date +'%Y-%b-%d_%H-%M-%S')_$SHORT_SHA - echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_ENV + SHORT_SHA=$(git rev-parse --short HEAD) + BUILD_DATE=$(date +'%Y-%b-%d_%H-%M-%S') + BUILD_VERSION="${SHORT_SHA}_${BUILD_DATE}" + echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_ENV - name: Install dependencies run: | @@ -134,7 +135,7 @@ jobs: - name: Upload clang-tidy results uses: actions/upload-artifact@v4 with: - name: Nightly_${{ env.BUILD_VERSION }}_clang-tidy_SCA + name: Nightly_Linux_StaticCodeAnalysis_clang-tidy_${{ env.BUILD_VERSION }} path: clang-tidy_analysis.txt cppcheck: @@ -146,9 +147,10 @@ jobs: - name: Set build date run: | - SHORT_SHA=$(git rev-parse --short HEAD) - BUILD_VERSION=$(date +'%Y-%b-%d_%H-%M-%S')_$SHORT_SHA - echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_ENV + SHORT_SHA=$(git rev-parse --short HEAD) + BUILD_DATE=$(date +'%Y-%b-%d_%H-%M-%S') + BUILD_VERSION="${SHORT_SHA}_${BUILD_DATE}" + echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_ENV - name: Install dependencies run: | @@ -257,7 +259,7 @@ jobs: - name: Upload cppcheck results uses: actions/upload-artifact@v4 with: - name: Nightly_${{ env.BUILD_VERSION }}_cppcheck_SCA + name: Nightly_Linux_StaticCodeAnalysis_cppcheck_${{ env.BUILD_VERSION }} path: cppcheck_output.txt windows: @@ -295,9 +297,10 @@ jobs: - name: Set Build Date run: | - $shortSha = git rev-parse --short HEAD - $buildDate = (Get-Date -Format 'yyyy-MMM-dd_HH-mm-ss') + "_$shortSha" - echo "BUILD_VERSION=$buildDate" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + $shortSha = git rev-parse --short HEAD + $buildDate = Get-Date -Format 'yyyy-MMM-dd_HH-mm-ss' + $buildVersion = "${shortSha}_$buildDate" + echo "BUILD_VERSION=$buildVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Check Cache for Vulkan SDK id: cache-vulkan @@ -344,6 +347,6 @@ jobs: - name: Upload Static Analysis Report uses: actions/upload-artifact@v4 with: - name: Nightly_${{ env.BUILD_VERSION}}_Windows_${{ matrix.config.build_type }}_${{ matrix.config.compiler }}_SCA + name: Nightly_Windows_StaticCodeAnalysis_${{ matrix.config.compiler }}_${{ matrix.config.build_type }}_${{ env.BUILD_VERSION}} path: msvc_code_analysis.txt retention-days: 60