diff --git a/.github/workflows/CI-macOS.yml b/.github/workflows/CI-macOS.yml index 385c105..7fdf13d 100644 --- a/.github/workflows/CI-macOS.yml +++ b/.github/workflows/CI-macOS.yml @@ -47,7 +47,7 @@ jobs: uses: actions/cache@v3 with: path: kekinian/bin/mac/osate.app - key: ${{ runner.os }}-${{ hashFiles('jvm/src/main/resources/phantom_versions.properties') }}-osate + key: ${{ runner.os }}-${{ hashFiles('kekinian/hamr/codegen/jvm/src/main/resources/phantom_versions.properties') }}-osate - name: Test run: | export COURSIER_CACHE=$GITHUB_WORKSPACE/cache/coursier @@ -69,9 +69,11 @@ jobs: ################################################ - # Install FMIDE + # Install OSATE ################################################ - $SIREUM_HOME/bin/install/fmide.cmd --verbose + export OSATE_HOME=$SIREUM_HOME/bin/mac/osate.app + + $SIREUM_HOME/hamr/codegen/bin/build.cmd install-osate-gumbo .ci/test.cmd \ No newline at end of file diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index 49f2960..237ae1a 100644 --- a/.github/workflows/CI-windows.yml +++ b/.github/workflows/CI-windows.yml @@ -63,7 +63,7 @@ jobs: uses: actions/cache@v3 with: path: kekinian\bin\win\osate - key: ${{ runner.os }}-${{ hashFiles('jvm\src\main\resources\phantom_versions.properties') }}-osate + key: ${{ runner.os }}-${{ hashFiles('kekinian\hamr\codegen\jvm\src\main\resources\phantom_versions.properties') }}-osate - name: Check LongPathsEnabled run: | (Get-ItemProperty "HKLM:System\CurrentControlSet\Control\FileSystem").LongPathsEnabled @@ -106,7 +106,9 @@ jobs: set PATH=%SIREUM_HOME%\bin;%PATH% - call %SIREUM_HOME%\bin\install\fmide.cmd --verbose || goto :error + set OSATE_HOME=%SIREUM_HOME%\bin\win\osate + + call %SIREUM_HOME%\hamr\codegen\bin\build.cmd install-osate-gumbo || goto :error call .ci\test.cmd || goto :error diff --git a/.github/workflows/CI_linux.yml b/.github/workflows/CI_linux.yml index 49ff75e..31c441c 100644 --- a/.github/workflows/CI_linux.yml +++ b/.github/workflows/CI_linux.yml @@ -47,7 +47,7 @@ jobs: uses: actions/cache@v3 with: path: kekinian/bin/linux/osate - key: ${{ runner.os }}-${{ hashFiles('jvm/src/main/resources/phantom_versions.properties') }}-osate + key: ${{ runner.os }}-${{ hashFiles('kekinian/hamr/codegen/jvm/src/main/resources/phantom_versions.properties') }}-osate - name: Test run: | export COURSIER_CACHE=$GITHUB_WORKSPACE/cache/coursier @@ -69,9 +69,11 @@ jobs: ################################################ - # Install FMIDE + # Install OSATE ################################################ - $SIREUM_HOME/bin/install/fmide.cmd --verbose + export OSATE_HOME=$SIREUM_HOME/bin/linux/osate + + $SIREUM_HOME/hamr/codegen/bin/build.cmd install-osate-gumbo .ci/test.cmd