diff --git a/.github/workflows/check-whitespace.yaml b/.github/workflows/check-whitespace.yaml index 75f0afe47..abc57dab6 100644 --- a/.github/workflows/check-whitespace.yaml +++ b/.github/workflows/check-whitespace.yaml @@ -9,7 +9,10 @@ on: jobs: check-whitespace: - runs-on: ubuntu-latest + runs-on: + - self-hosted + - linux + - x64 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 541b72015..e64508549 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,9 @@ on: jobs: test: - runs-on: ${{ matrix.os }} + runs-on: + group: xmis + labels: [self-hosted, ubuntu-latest] strategy: fail-fast: false matrix: @@ -90,9 +92,14 @@ jobs: echo "module=${module}" >> "$GITHUB_OUTPUT" echo "version=${version}" >> "$GITHUB_OUTPUT" echo "testpath=${testpath}" >> "$GITHUB_OUTPUT" - - NJS_VERSION=$(sed -n "s/NJS_VERSION := \(.*\)/\1/p" pkg/contrib/src/njs/version) - echo "njs_version=${NJS_VERSION}" >> "$GITHUB_OUTPUT" + if [ -f pkg/contrib/src/njs/version ]; then + NJS_VERSION=$(sed -n "s/NJS_VERSION := \(.*\)/\1/p" pkg/contrib/src/njs/version) + echo "njs_version=${NJS_VERSION}" >> "$GITHUB_OUTPUT" + else + echo "Warning: pkg/contrib/src/njs/version not found" + fi + # NJS_VERSION=$(sed -n "s/NJS_VERSION := \(.*\)/\1/p" pkg/contrib/src/njs/version) + # echo "njs_version=${NJS_VERSION}" >> "$GITHUB_OUTPUT" cat "$GITHUB_OUTPUT" @@ -340,13 +347,16 @@ jobs: # Ensure all users and processes can execute - name: Fix permissions run: | - sudo chmod -R +x /home/runner - namei -l ${{ github.workspace }} + sudo chmod -R +x "$GITHUB_WORKSPACE" + namei -l "$GITHUB_WORKSPACE" +# run: | +# sudo chmod -R +x /home/runner +# namei -l ${{ github.workspace }} # Install python3 if not present - uses: actions/setup-python@v5 with: - python-version: '3' + python-version: '3.14' if: steps.metadata.outputs.module != 'wasm' && steps.metadata.outputs.module != 'wasm-wasi-component' diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index dc89c0b26..1ba6d3d1d 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -9,7 +9,11 @@ on: permissions: {} jobs: Fuzzing: - runs-on: ubuntu-latest + runs-on: + - self-hosted + - linux + - x64 +# runs-on: ubuntu-latest permissions: security-events: write steps: @@ -27,7 +31,7 @@ jobs: fuzz-seconds: 300 output-sarif: true - name: Upload Crash - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() && steps.build.outcome == 'success' with: name: artifacts