diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f5dbc40..433bab8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,15 +20,18 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 14 - - uses: aviate-labs/setup-dfx@v0.2.3 + - uses: aviate-labs/setup-dfx@v0.2.5 with: dfx-version: 0.13.1 - name: "install Motoko binaries" run: | + sudo dfx cache install wget https://github.com/dfinity/motoko/releases/download/${{ env.moc_version }}/motoko-linux64-${{ env.moc_version }}.tar.gz mkdir -p /home/runner/bin tar -xzf motoko-linux64-${{ env.moc_version }}.tar.gz -C /home/runner/bin + dfx cache show | xargs -n 1 -I{} mkdir -p {} + dfx cache show | xargs -n 1 -I{} cp -r /home/runner/bin/* {} echo "/home/runner/bin" >> $GITHUB_PATH - name: "install vessel" diff --git a/Makefile b/Makefile index e318f36..acdc70f 100644 --- a/Makefile +++ b/Makefile @@ -3,21 +3,21 @@ install-dfx-cache: dfx cache install -check: install-dfx-cache +check: find src -type f -name '*.mo' -print0 | xargs -0 $(shell dfx cache show)/moc $(shell vessel sources) --check -check-mops: install-dfx-cache +check-mops: find src -type f -name '*.mo' -print0 | xargs -0 $(shell dfx cache show)/moc $(shell mops sources) --check all: check-strict check-strict-mops docs test -check-strict: install-dfx-cache +check-strict: find src -type f -name '*.mo' -print0 | xargs -0 $(shell dfx cache show)/moc $(shell vessel sources) -Werror --check -check-strict-mops: install-dfx-cache +check-strict-mops: find src -type f -name '*.mo' -print0 | xargs -0 $(shell dfx cache show)/moc $(shell mops sources) -Werror --check -docs: install-dfx-cache +docs: $(shell dfx cache show)/mo-doc test: diff --git a/package-set.dhall b/package-set.dhall index df8c71d..3c2ade6 100644 --- a/package-set.dhall +++ b/package-set.dhall @@ -1,5 +1,5 @@ let vessel_package_set = - https://github.com/dfinity/vessel-package-set/releases/download/mo-0.8.3-20230224/package-set.dhall + https://github.com/dfinity/vessel-package-set/releases/download/mo-0.8.7-20230406/package-set.dhall let Package = { name : Text, version : Text, repo : Text, dependencies : List Text } @@ -26,7 +26,11 @@ let , version = "v0.2.0" , dependencies = [ "base"] }, - { name = "base", repo = "https://github.com/dfinity/motoko-base.git", version = "moc-0.8.1", dependencies = []: List Text }, + { name = "base" + , repo = "https://github.com/dfinity/motoko-base.git" + , version = "a867420b4c147c0df64e999fb11f0978e82e1d2a" + , dependencies = []: List Text + }, { name = "map" , repo = "https://github.com/ZhenyaUsenko/motoko-hash-map" , version = "v7.0.0" diff --git a/vessel.dhall b/vessel.dhall index 9c2f3cd..66354e1 100644 --- a/vessel.dhall +++ b/vessel.dhall @@ -1,4 +1,4 @@ { - dependencies = [ "base", "matchers", "candid", "xtendedNumbers", "stablebuffer", "map","candy_0_1_12"], - compiler = Some "0.8.1", + dependencies = ["base", "matchers", "candid", "xtendedNumbers", "stablebuffer", "map", "candy_0_1_12"], + compiler = Some "0.8.7", }