diff --git a/.gitea/workflows/continuous_integration.yaml b/.gitea/workflows/continuous_integration.yaml index 19f1614..2ab0e65 100644 --- a/.gitea/workflows/continuous_integration.yaml +++ b/.gitea/workflows/continuous_integration.yaml @@ -58,7 +58,7 @@ jobs: # hieronder (waar de env-context zelf niet beschikbaar is, omdat dat een # aanroep naar een reusable workflow is). config: - runs-on: ubuntu-latest + runs-on: linux outputs: artifact_name: ${{ steps.set.outputs.artifact_name }} artifact_name_production: ${{ steps.set.outputs.artifact_name_production }} @@ -77,7 +77,7 @@ jobs: echo "deploy_path_production=${{ env.DEPLOY_PATH_PRODUCTION }}" >> "$GITHUB_OUTPUT" prepare: - runs-on: ubuntu-latest + runs-on: linux steps: - uses: actions/checkout@v4 @@ -104,7 +104,7 @@ jobs: build: needs: prepare - runs-on: ubuntu-latest + runs-on: linux steps: - uses: actions/checkout@v4 @@ -169,7 +169,7 @@ jobs: # gedeployed worden, wat Sentry-events/analytics verkeerd zou taggen. build-production: needs: prepare - runs-on: ubuntu-latest + runs-on: linux if: github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_production == 'true' steps: - uses: actions/checkout@v4 @@ -221,11 +221,12 @@ jobs: test: # Lint + unit tests hebben het build-artefact niet nodig en lopen daarom parallel aan - # 'build'. Runner: de repository-variabele CI_FAST_RUNNER (bijv. 'bryan-desktop', sneller) - # of, als die niet gezet is, de Pi. Build en deploy blijven bewust op de Pi - # (ubuntu-latest): op de desktop faalden die (ssh/sftp en containers). + # 'build'. + # Runners (zelfde indeling als de ASF-site): 'linux' = elke vrije runner (pc of Pi; de pc is + # sneller, valt de pc weg dan neemt de Pi alles over), 'raspberry-pi' = alleen de Pi. Alleen de + # deploy (ssh/sftp en containers) vereist de Pi, zie deploy.yaml. needs: prepare - runs-on: ${{ vars.CI_FAST_RUNNER || 'ubuntu-latest' }} + runs-on: linux steps: - uses: actions/checkout@v4 diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 4c535e7..222ab8b 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -14,7 +14,7 @@ on: jobs: deploy: - runs-on: ubuntu-latest + runs-on: raspberry-pi steps: - name: Download build artifact uses: actions/download-artifact@v3