Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use default CI runners #109

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
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
19 changes: 5 additions & 14 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@ env:

jobs:
test-formulae:
runs-on: "arc-${{ matrix.arch }}-small"
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
# note: (@niklas) Disable ARM64 test for now because we keep getting an ARM64 CI runner with an
# IP address that is blacklisted by Google storage APIs, failing some formula's downloads.
arch: ["amd64"] #, "arm64"]
arch: ["amd64", "arm64"]
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -37,7 +35,7 @@ jobs:
exit $status_code

build:
runs-on: "arc-${{ matrix.arch }}-large"
runs-on: ubuntu-latest
needs: [ test-formulae ]
strategy:
fail-fast: false
Expand All @@ -64,18 +62,12 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/setup-python@v5
if: "${{ matrix.arch == 'amd64' }}"
with:
python-version: "3.10"

- name: Create Python 3 virtualenv (arm64)
if: "${{ matrix.arch == 'arm64' }}"
- name: Create Python 3 virtualenv
run: python3.10 -m venv .venv

- name: Activate Python 3 virtualenv (arm64)
if: "${{ matrix.arch == 'arm64' }}"
run: source .venv/bin/activate && env >> $GITHUB_ENV

- name: Install kraken-wrapper
run: pip install uv==0.3.0 && uv tool install kraken-wrapper==0.39.0

Expand All @@ -88,7 +80,6 @@ jobs:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env['ACTIONS_CACHE_URL'])
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env['ACTIONS_RUNTIME_TOKEN'])
# core.exportVariable('ACTIONS_RUNTIME_URL', process.env['ACTIONS_RUNTIME_URL'])

- run: |
krakenw r -s -v
Expand All @@ -104,7 +95,7 @@ jobs:
path: build/.kraken/buildenv/state*.dill

manifest-tool:
runs-on: "arc-amd64-small"
runs-on: ubuntu-latest
needs: [ build ]
permissions:
packages: write
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ COPY --from=docker/buildx-bin:latest /buildx /usr/libexec/docker/cli-plugins/doc
# Rust tools
#
ARG ACTIONS_CACHE_URL
RUN --mount=type=secret,id=ACTIONS_RUNTIME_TOKEN : \
RUN --mount=type=secret,id=ACTIONS_RUNTIME_TOKEN \
--mount=type=cache,target=/tmp/sccache,rw : \
&& rustup toolchain install 1.80.0 \
&& rustup default 1.80.0 \
&& export SCCACHE_REDIS_ENDPOINT=redis://redis-headless.sccache:6379 \
&& sccache --start-server \
&& SCCACHE_GHA_ENABLED=on ACTIONS_RUNTIME_TOKEN="$(cat /run/secrets/ACTIONS_RUNTIME_TOKEN)" sccache --start-server \
&& export RUSTC_WRAPPER=sccache CARGO_INCREMENTAL=0 \
&& time cargo install cargo-deny --version 0.14.24 --locked \
&& time cargo install cargo-semver-checks --version 0.33.0 --locked \
Expand Down
Loading