Skip to content
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
63bba0b
WIP
ggreif Jul 4, 2025
1ac6c84
try building `motoko-core`
ggreif Jul 7, 2025
c26d74d
Revert "WIP"
ggreif Jul 7, 2025
992c86d
disable issue creation for now
ggreif Jul 7, 2025
94882c7
fix?
ggreif Jul 7, 2025
dceb668
another try
ggreif Jul 7, 2025
7cb71ac
try harder
ggreif Jul 7, 2025
fa86494
new hope
ggreif Jul 7, 2025
26b71ff
cheaper?
ggreif Jul 7, 2025
654d390
prepare for 2 steps
ggreif Jul 8, 2025
7424ff5
split
ggreif Jul 8, 2025
9229714
ooops
ggreif Jul 8, 2025
9567c08
setup
ggreif Jul 8, 2025
6515195
fetch `moc` too
ggreif Jul 8, 2025
8a4b6a1
get it first
ggreif Jul 8, 2025
ea72a79
pick a real target for now
ggreif Jul 8, 2025
30d0338
reorder
ggreif Jul 8, 2025
bf15713
looks
ggreif Jul 8, 2025
c5ec886
hmmm
ggreif Jul 8, 2025
f5e6584
tolerate
ggreif Jul 8, 2025
d5aee7a
return of the jedi
ggreif Jul 8, 2025
3f23065
print-out-paths
ggreif Jul 8, 2025
48cce4e
after
ggreif Jul 8, 2025
3989cff
pop the cache
ggreif Jul 8, 2025
e55d335
no need to quote these
ggreif Jul 8, 2025
d8a0e38
fixup
ggreif Jul 8, 2025
badd556
look closer
ggreif Jul 8, 2025
b36b32b
softer
ggreif Jul 8, 2025
bade76c
save and restore
ggreif Jul 9, 2025
2341f9d
output `mops` version
ggreif Jul 9, 2025
8810dca
ooops
ggreif Jul 9, 2025
00d2aba
self update
ggreif Jul 9, 2025
58af100
get my branch
ggreif Jul 9, 2025
d70f30a
Revert "self update"
ggreif Jul 9, 2025
f76ca03
Merge branch 'master' into gabor/core-tests
ggreif Jul 9, 2025
92c134d
Update .github/workflows/nightly-macos-test.yml
ggreif Jul 9, 2025
95bc34e
Update .github/workflows/nightly-macos-test.yml
ggreif Jul 9, 2025
62073a5
Update .github/workflows/nightly-macos-test.yml
ggreif Jul 9, 2025
a911ecc
Update .github/workflows/nightly-macos-test.yml
ggreif Jul 9, 2025
2faa27b
Update .github/workflows/nightly-macos-test.yml
ggreif Jul 9, 2025
c6fa96f
Update .github/workflows/nightly-macos-test.yml
ggreif Jul 9, 2025
3201cf1
back to `npx`
ggreif Jul 10, 2025
19dc617
we need this
ggreif Jul 10, 2025
6b3d309
bring restore closer
ggreif Jul 10, 2025
1ce2a00
ooops
ggreif Jul 10, 2025
280ead0
Merge branch 'master' into gabor/core-tests
ggreif Jul 10, 2025
a42898f
add comments
ggreif Jul 10, 2025
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
40 changes: 39 additions & 1 deletion .github/workflows/nightly-macos-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,46 @@ jobs:
test-name: macos-13-${{ matrix.build_type }}-tests
cachix-auth-token: ${{ secrets.CACHIX_AUTH_TOKEN }}

motoko-core-tests:
needs: systems-go-tests
runs-on: ubuntu-latest
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cheapest...

steps:
- name: Get `motoko` Repo
uses: actions/checkout@v4
- name: Populate `moc`
uses: ./.github/actions/test-blueprint
with:
os: ubuntu-latest
test-target: moc
test-name: fetch-moc
cachix-auth-token: ${{ secrets.CACHIX_AUTH_TOKEN }}
- name: Build `moc`
run: |
nix build .#moc --print-out-paths
- name: Save the `test-blueprint` action
run: cp -r ./.github/actions/test-blueprint ..
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not super clear to me: why do we need to copy the blueprint somewhere else?

Copy link
Contributor Author

@ggreif ggreif Jul 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the checkout of motoko-core zeroes out the previous checkout. Explained: #5317 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oooh, I see -- can you please add a comment here as well about it so we don't break it some time later when we refactor?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like this:
Screenshot 2025-07-10 at 11 31 17

- name: Get `motoko-core` Repo
uses: actions/checkout@v4
with:
repository: dfinity/motoko-core
fetch-depth: "0"
- name: Restore the `test-blueprint` action
run: mv ../test-blueprint ./.github/actions
- name: Set up `mops`
uses: dfinity/motoko-core/.github/actions/setup@main
- name: Set up `mops` cache
run: |
npx ic-mops --version
npx ${DFX_MOC_PATH} --version
Copy link
Contributor Author

@ggreif ggreif Jul 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This runs moc and primes the .mops cache.

- name: Fixup `mops` cache
run: |
ln -sf /nix/store/*-moc/bin/moc $(cat .mops/moc-*)
npx ${DFX_MOC_PATH} --version
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above suggestion:

Suggested change
npx ${DFX_MOC_PATH} --version
${DFX_MOC_PATH} --version

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, turns out I need npx:

/home/runner/work/_temp/97eb8911-f1e2-402c-9905-dd49540368c6.sh: line 2: moc-wrapper: command not found
Error: Process completed with exit code 127.

- name: Run `motoko-core` Tests
run: npm test

create-issue:
needs: [common-tests, gc-tests, systems-go-tests]
needs: [common-tests, gc-tests, systems-go-tests, motoko-core-tests]
if: ${{ always() && contains(needs.*.result, 'failure') }}
runs-on: ubuntu-latest # No need to run on macOS-13, the ubuntu runner should be cheaper to run.
steps:
Expand Down
14 changes: 8 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,10 @@
matchRelease == null &&
matchGC == null;
in {
"debug" = matchDebug != null;
"release" = matchRelease != null;
"gc" = matchGC != null;
"common" = matchCommon;
debug = matchDebug != null;
release = matchRelease != null;
gc = matchGC != null;
common = matchCommon;
}.${type})
tests);

Expand Down Expand Up @@ -208,8 +208,8 @@
in
{
packages = checks // common-constituents // rec {
"release" = buildableReleaseMoPackages;
"debug" = buildableDebugMoPackages;
release = buildableReleaseMoPackages;
debug = buildableDebugMoPackages;

inherit nix-update tests js;

Expand Down Expand Up @@ -255,6 +255,8 @@
++ builtins.attrValues js;
};

inherit (debug) moc;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

single relevant addition, needed by motoko-core-tests


default = release-systems-go;
};

Expand Down
Loading