diff --git a/.github/actions/xahau-ga-build/action.yml b/.github/actions/xahau-ga-build/action.yml index 7795ee00d..4b9a637d5 100644 --- a/.github/actions/xahau-ga-build/action.yml +++ b/.github/actions/xahau-ga-build/action.yml @@ -40,7 +40,6 @@ inputs: runs: using: 'composite' steps: - # Generate a safe branch name for cache keys - name: Generate safe branch name if: inputs.ccache_enabled == 'true' id: safe-branch @@ -49,7 +48,6 @@ runs: SAFE_BRANCH=$(echo "${{ github.ref_name }}" | tr -c 'a-zA-Z0-9_.-' '-') echo "name=${SAFE_BRANCH}" >> $GITHUB_OUTPUT - # Restore ccache if enabled - name: Restore ccache directory if: inputs.ccache_enabled == 'true' id: ccache-restore @@ -63,7 +61,6 @@ runs: ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}- ${{ runner.os }}-ccache-v${{ inputs.cache_version }}- - # Configure project - name: Configure project shell: bash run: | @@ -92,20 +89,17 @@ runs: -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \ -DCMAKE_BUILD_TYPE=${{ inputs.configuration }} - # Build project - name: Build project shell: bash run: | cd ${{ inputs.build_dir }} cmake --build . --config ${{ inputs.configuration }} --parallel $(nproc) - # Show ccache statistics - name: Show ccache statistics if: inputs.ccache_enabled == 'true' shell: bash run: ccache -s - # Save ccache - name: Save ccache directory if: inputs.ccache_enabled == 'true' uses: actions/cache/save@v4 diff --git a/.github/actions/xahau-ga-dependencies/action.yml b/.github/actions/xahau-ga-dependencies/action.yml index 84b1ad025..0340e937e 100644 --- a/.github/actions/xahau-ga-dependencies/action.yml +++ b/.github/actions/xahau-ga-dependencies/action.yml @@ -34,7 +34,6 @@ outputs: runs: using: 'composite' steps: - # Generate a safe branch name for cache keys - name: Generate safe branch name if: inputs.cache_enabled == 'true' id: safe-branch @@ -43,7 +42,6 @@ runs: SAFE_BRANCH=$(echo "${{ github.ref_name }}" | tr -c 'a-zA-Z0-9_.-' '-') echo "name=${SAFE_BRANCH}" >> $GITHUB_OUTPUT - # Restore Conan cache - name: Restore Conan cache if: inputs.cache_enabled == 'true' id: cache-restore-conan @@ -58,14 +56,12 @@ runs: ${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}- ${{ runner.os }}-conan-v${{ inputs.cache_version }}- - # Export custom recipes - name: Export custom recipes shell: bash run: | conan export external/snappy snappy/1.1.9@ conan export external/soci soci/4.0.3@ - # Install dependencies - name: Install dependencies shell: bash run: | @@ -80,7 +76,6 @@ runs: --settings build_type=${{ inputs.configuration }} \ .. - # Save Conan cache if we installed dependencies - name: Save Conan cache if: inputs.cache_enabled == 'true' && steps.cache-restore-conan.outputs.cache-hit != 'true' uses: actions/cache/save@v4 diff --git a/.github/workflows/xahau-ga-checkpatterns.yml b/.github/workflows/xahau-ga-checkpatterns.yml index 87f043a0d..d17223d9d 100644 --- a/.github/workflows/xahau-ga-checkpatterns.yml +++ b/.github/workflows/xahau-ga-checkpatterns.yml @@ -2,7 +2,9 @@ name: Nix - GA Runner on: push: - branches-ignore: ["dev", "candidate", "release"] + branches: ["dev", "candidate", "release"] + pull_request: + branches: ["dev", "candidate", "release"] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -23,4 +25,4 @@ jobs: echo "Warning: suspicious_patterns.sh not found, skipping check" # Still exit with success for compatibility with dependent jobs exit 0 - fi \ No newline at end of file + fi diff --git a/.github/workflows/xahau-ga-macos.yml b/.github/workflows/xahau-ga-macos.yml index a20a64e06..5c802c7e9 100644 --- a/.github/workflows/xahau-ga-macos.yml +++ b/.github/workflows/xahau-ga-macos.yml @@ -2,7 +2,9 @@ name: MacOS - GA Runner on: push: - branches-ignore: ["dev", "candidate", "release"] + branches: ["dev", "candidate", "release"] + pull_request: + branches: ["dev", "candidate", "release"] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/xahau-ga-nix.yml b/.github/workflows/xahau-ga-nix.yml index b86db7a57..79a0f23ac 100644 --- a/.github/workflows/xahau-ga-nix.yml +++ b/.github/workflows/xahau-ga-nix.yml @@ -2,7 +2,9 @@ name: Nix - GA Runner on: push: - branches-ignore: ["dev", "candidate", "release"] + branches: ["dev", "candidate", "release"] + pull_request: + branches: ["dev", "candidate", "release"] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/xahau-sh-build-in-docker.yml b/.github/workflows/xahau-sh-build-in-docker.yml index 029d36087..fc0be3864 100644 --- a/.github/workflows/xahau-sh-build-in-docker.yml +++ b/.github/workflows/xahau-sh-build-in-docker.yml @@ -32,19 +32,9 @@ jobs: clean: true fetch-depth: 2 # Only get the last 2 commits, to avoid fetching all history - checkpatterns: - runs-on: [self-hosted, vanity] - needs: checkout - defaults: - run: - working-directory: ${{ needs.checkout.outputs.checkout_path }} - steps: - - name: Check for suspicious patterns - run: /bin/bash suspicious_patterns.sh - build: runs-on: [self-hosted, vanity] - needs: [checkpatterns, checkout] + needs: [checkout] defaults: run: working-directory: ${{ needs.checkout.outputs.checkout_path }}