Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/component-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ jobs:
runs-on: ${{ needs.setup.outputs.runner }}
timeout-minutes: 30
env:
# On ARC the cache mounts go to S3 when the caller passes the bucket credentials, and the GitHub cache otherwise.
S3_CACHE: ${{ inputs.use-arc-runners && secrets.GH_ACTION_ACCESS_KEY_ID != '' }}
steps:
- name: Checkout
Expand Down Expand Up @@ -221,8 +220,6 @@ jobs:
# docker driver does not support cache-to).
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
# ARC builders start empty and the registry cache does not carry RUN --mount=type=cache
# contents (e.g. /root/.gradle), so persist them between builds.
- name: Restore Dockerfile cache mounts
id: cache-mounts
if: ${{ inputs.use-arc-runners && env.S3_CACHE != 'true' }}
Expand All @@ -232,8 +229,6 @@ jobs:
key: buildkit-cache-mounts-${{ inputs.docker-file-name }}-${{ hashFiles('**/*.gradle.kts', '**/gradle.properties', 'gradle/libs.versions.toml', 'gradle/wrapper/gradle-wrapper.properties') }}
restore-keys: |
buildkit-cache-mounts-${{ inputs.docker-file-name }}-
# The combined action, not restore/save: its post-step save must run after the
# cache-dance post step below has extracted the mounts from the builder.
- name: Restore Dockerfile cache mounts (S3)
id: cache-mounts-s3
if: ${{ env.S3_CACHE == 'true' }}
Expand All @@ -243,7 +238,6 @@ jobs:
RUNS_ON_RUNNER_NAME: ""
AWS_ACCESS_KEY_ID: ${{ secrets.GH_ACTION_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.GH_ACTION_SECRET_ACCESS_KEY }}
# Blank the ecr-put-image session exported by the credentials step above.
AWS_SESSION_TOKEN: ""
AWS_REGION: eu-west-1
with: *cache-mounts
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/component-test-kotlin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ permissions:
actions: read

env:
# Test names with non-ASCII characters become report file names; the ARC runner image defaults to a POSIX locale.
LC_ALL: ${{ inputs.use-arc-runners && 'C.UTF-8' || '' }}

jobs:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/pull-request-kotlin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ on:
required: true
description: "SonarQube token"
env:
# Test names with non-ASCII characters become report file names; the ARC runner image defaults to a POSIX locale.
LC_ALL: ${{ (inputs.use-arc-runners && github.event.repository.private) && 'C.UTF-8' || '' }}
# On ARC the caches use S3 when the caller passes the bucket credentials, and the GitHub cache otherwise.
S3_CACHE: ${{ (inputs.use-arc-runners && github.event.repository.private) && secrets.GH_ACTION_ACCESS_KEY_ID != '' }}
jobs:
setup:
Expand Down Expand Up @@ -330,7 +328,6 @@ jobs:
with:
gradle-module: ${{ inputs.gradle-module }}
gradle-tasks: 'sonar'
# ARC runs in the same cluster as SonarQube, whose vpn.internal hostname is only reachable over Tailscale.
gradle-args: ${{ inputs.gradle-args }}${{ (inputs.use-arc-runners && github.event.repository.private) && ' -Dsonar.host.url=http://sonarqube.sonarqube.svc.cluster.local:9000' || '' }}
# Restores what continue-on-error was meant to express, in an `if` where `inputs` does evaluate.
- name: Fail when a blocking Sonar scan failed
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/sonar-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ on:
required: true
description: "Sonar token (Optional, won't publish to sonar if not present)"
env:
# Test names with non-ASCII characters become report file names; the ARC runner image defaults to a POSIX locale.
LC_ALL: ${{ (inputs.use-arc-runners && github.event.repository.private) && 'C.UTF-8' || '' }}
# On ARC the caches use S3 when the caller passes the bucket credentials, and the GitHub cache otherwise.
S3_CACHE: ${{ (inputs.use-arc-runners && github.event.repository.private) && secrets.GH_ACTION_ACCESS_KEY_ID != '' }}
jobs:
setup:
Expand Down Expand Up @@ -210,7 +208,6 @@ jobs:
with:
gradle-module: ${{ inputs.gradle-module }}
gradle-tasks: 'sonar'
# ARC runs in the same cluster as SonarQube, whose vpn.internal hostname is only reachable over Tailscale.
gradle-args: ${{ inputs.gradle-args }}${{ (inputs.use-arc-runners && github.event.repository.private) && ' -Dsonar.host.url=http://sonarqube.sonarqube.svc.cluster.local:9000' || '' }}
- name: Upload build reports
if: always()
Expand Down
Loading