Skip to content

Commit 81e6fb1

Browse files
committed
internal/ci: revert the use of Namespace MacOS and caching
Until we have figured out why the setup-python step does not work when Namespace's volume-based caching kicks in. See: actions/setup-python#1244 Signed-off-by: Daniel Martí <mvdan@mvdan.cc> Change-Id: Ia255ab21bedbb9884e051edc2ff9e52899070311 Reviewed-on: https://cue.gerrithub.io/c/cue-lang/cue-py/+/1226689 Reviewed-by: Paul Jolly <paul@myitcv.io> TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>
1 parent a5c7029 commit 81e6fb1

3 files changed

Lines changed: 6 additions & 10 deletions

File tree

.github/workflows/trybot.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- "3.12"
2525
runner:
2626
- namespace-profile-linux-amd64
27-
- ns-macos-arm64
27+
- macos-14
2828
runs-on: ${{ matrix.runner }}
2929
if: |-
3030
(contains(github.event.head_commit.message, '
@@ -95,14 +95,6 @@ jobs:
9595
with:
9696
python-version: ${{ matrix.python-version }}
9797
cache: pip
98-
- if: github.event_name != 'schedule' && matrix.runner != 'ns-windows-amd64'
99-
uses: namespacelabs/nscloud-cache-action@v1
100-
with:
101-
cache: go
102-
- if: |-
103-
github.repository == 'cue-lang/cue-py' && (((github.ref == 'refs/heads/main') && (! (contains(github.event.head_commit.message, '
104-
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test'))
105-
run: go env -w GOFLAGS=-count=1
10698
- name: pip install
10799
run: pip install -r requirements.txt
108100
- name: Checkout libcue

internal/ci/github/trybot.cue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ workflows: trybot: _repo.bashWorkflow & {
6666
// cachePre must come after installing Go,
6767
// because the cache locations
6868
// are established by running each tool.
69-
for v in _repo.setupCaches {v},
69+
// TODO(mvdan): re-enable once https://github.com/actions/setup-python/issues/1244 is resolved.
70+
// for v in _repo.setupCaches {v},
7071

7172
_runPip,
7273

internal/ci/repo/repo.cue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ botGitHubUserEmail: "cueckoo@gmail.com"
1717
defaultBranch: "main"
1818

1919
latestStablePython: "3.12"
20+
21+
// TODO(mvdan): remove once https://github.com/actions/setup-python/issues/1244 is resolved.
22+
macosMachine: "macos-14"

0 commit comments

Comments
 (0)