change on fields

This commit is contained in:
Denis Angell
2025-03-28 11:44:22 +01:00
parent 245cf4a676
commit 5eac2d3e44
6 changed files with 11 additions and 26 deletions

View File

@@ -40,7 +40,6 @@ inputs:
runs: runs:
using: 'composite' using: 'composite'
steps: steps:
# Generate a safe branch name for cache keys
- name: Generate safe branch name - name: Generate safe branch name
if: inputs.ccache_enabled == 'true' if: inputs.ccache_enabled == 'true'
id: safe-branch id: safe-branch
@@ -49,7 +48,6 @@ runs:
SAFE_BRANCH=$(echo "${{ github.ref_name }}" | tr -c 'a-zA-Z0-9_.-' '-') SAFE_BRANCH=$(echo "${{ github.ref_name }}" | tr -c 'a-zA-Z0-9_.-' '-')
echo "name=${SAFE_BRANCH}" >> $GITHUB_OUTPUT echo "name=${SAFE_BRANCH}" >> $GITHUB_OUTPUT
# Restore ccache if enabled
- name: Restore ccache directory - name: Restore ccache directory
if: inputs.ccache_enabled == 'true' if: inputs.ccache_enabled == 'true'
id: ccache-restore 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 }}-${{ inputs.compiler-id }}-
${{ runner.os }}-ccache-v${{ inputs.cache_version }}- ${{ runner.os }}-ccache-v${{ inputs.cache_version }}-
# Configure project
- name: Configure project - name: Configure project
shell: bash shell: bash
run: | run: |
@@ -92,20 +89,17 @@ runs:
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \ -DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \
-DCMAKE_BUILD_TYPE=${{ inputs.configuration }} -DCMAKE_BUILD_TYPE=${{ inputs.configuration }}
# Build project
- name: Build project - name: Build project
shell: bash shell: bash
run: | run: |
cd ${{ inputs.build_dir }} cd ${{ inputs.build_dir }}
cmake --build . --config ${{ inputs.configuration }} --parallel $(nproc) cmake --build . --config ${{ inputs.configuration }} --parallel $(nproc)
# Show ccache statistics
- name: Show ccache statistics - name: Show ccache statistics
if: inputs.ccache_enabled == 'true' if: inputs.ccache_enabled == 'true'
shell: bash shell: bash
run: ccache -s run: ccache -s
# Save ccache
- name: Save ccache directory - name: Save ccache directory
if: inputs.ccache_enabled == 'true' if: inputs.ccache_enabled == 'true'
uses: actions/cache/save@v4 uses: actions/cache/save@v4

View File

@@ -34,7 +34,6 @@ outputs:
runs: runs:
using: 'composite' using: 'composite'
steps: steps:
# Generate a safe branch name for cache keys
- name: Generate safe branch name - name: Generate safe branch name
if: inputs.cache_enabled == 'true' if: inputs.cache_enabled == 'true'
id: safe-branch id: safe-branch
@@ -43,7 +42,6 @@ runs:
SAFE_BRANCH=$(echo "${{ github.ref_name }}" | tr -c 'a-zA-Z0-9_.-' '-') SAFE_BRANCH=$(echo "${{ github.ref_name }}" | tr -c 'a-zA-Z0-9_.-' '-')
echo "name=${SAFE_BRANCH}" >> $GITHUB_OUTPUT echo "name=${SAFE_BRANCH}" >> $GITHUB_OUTPUT
# Restore Conan cache
- name: Restore Conan cache - name: Restore Conan cache
if: inputs.cache_enabled == 'true' if: inputs.cache_enabled == 'true'
id: cache-restore-conan 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 }}-${{ inputs.compiler-id }}-
${{ runner.os }}-conan-v${{ inputs.cache_version }}- ${{ runner.os }}-conan-v${{ inputs.cache_version }}-
# Export custom recipes
- name: Export custom recipes - name: Export custom recipes
shell: bash shell: bash
run: | run: |
conan export external/snappy snappy/1.1.9@ conan export external/snappy snappy/1.1.9@
conan export external/soci soci/4.0.3@ conan export external/soci soci/4.0.3@
# Install dependencies
- name: Install dependencies - name: Install dependencies
shell: bash shell: bash
run: | run: |
@@ -80,7 +76,6 @@ runs:
--settings build_type=${{ inputs.configuration }} \ --settings build_type=${{ inputs.configuration }} \
.. ..
# Save Conan cache if we installed dependencies
- name: Save Conan cache - name: Save Conan cache
if: inputs.cache_enabled == 'true' && steps.cache-restore-conan.outputs.cache-hit != 'true' if: inputs.cache_enabled == 'true' && steps.cache-restore-conan.outputs.cache-hit != 'true'
uses: actions/cache/save@v4 uses: actions/cache/save@v4

View File

@@ -2,7 +2,9 @@ name: Nix - GA Runner
on: on:
push: push:
branches-ignore: ["dev", "candidate", "release"] branches: ["dev", "candidate", "release"]
pull_request:
branches: ["dev", "candidate", "release"]
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}
@@ -23,4 +25,4 @@ jobs:
echo "Warning: suspicious_patterns.sh not found, skipping check" echo "Warning: suspicious_patterns.sh not found, skipping check"
# Still exit with success for compatibility with dependent jobs # Still exit with success for compatibility with dependent jobs
exit 0 exit 0
fi fi

View File

@@ -2,7 +2,9 @@ name: MacOS - GA Runner
on: on:
push: push:
branches-ignore: ["dev", "candidate", "release"] branches: ["dev", "candidate", "release"]
pull_request:
branches: ["dev", "candidate", "release"]
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}

View File

@@ -2,7 +2,9 @@ name: Nix - GA Runner
on: on:
push: push:
branches-ignore: ["dev", "candidate", "release"] branches: ["dev", "candidate", "release"]
pull_request:
branches: ["dev", "candidate", "release"]
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}

View File

@@ -32,19 +32,9 @@ jobs:
clean: true clean: true
fetch-depth: 2 # Only get the last 2 commits, to avoid fetching all history 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: build:
runs-on: [self-hosted, vanity] runs-on: [self-hosted, vanity]
needs: [checkpatterns, checkout] needs: [checkout]
defaults: defaults:
run: run:
working-directory: ${{ needs.checkout.outputs.checkout_path }} working-directory: ${{ needs.checkout.outputs.checkout_path }}