diff --git a/.circleci/config.yml b/.circleci/config.yml index b244b9403..f00dab617 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,6 +52,9 @@ jobs: - run: name: Install dependencies command: pnpm install --no-frozen-lockfile + - run: + name: Install core dependencies + command: cd ./core && pnpm install --no-frozen-lockfile - run: name: Build ADAM (without bootstrap languages) command: pnpm run build-libs @@ -111,6 +114,9 @@ jobs: - run: name: Install dependencies command: pnpm install --no-frozen-lockfile + - run: + name: Install core dependencies + command: cd ./core && pnpm install --no-frozen-lockfile - run: name: Build bootstrap languages command: pnpm run build-languages diff --git a/.github/workflows/integration_cli.yml.disabled b/.github/workflows/integration_cli.yml.disabled index ff81f3f80..57dfb21aa 100644 --- a/.github/workflows/integration_cli.yml.disabled +++ b/.github/workflows/integration_cli.yml.disabled @@ -27,6 +27,11 @@ jobs: override: true toolchain: 1.73.0 + - name: Use Python 3.11 + uses: actions/setup-python@v4 + with: + python-version: '3.11' + - name: Install protobuf & cmake run: brew install protobuf cmake @@ -76,4 +81,3 @@ jobs: - name: Run integration test script run: ./tests/bats/bin/bats tests/integration.bats || cat ~/Library/Logs/DiagnosticReports/* - \ No newline at end of file diff --git a/.github/workflows/integration_js.yml.disabled b/.github/workflows/integration_js.yml.disabled index 7203a3cd5..4ecb34a31 100644 --- a/.github/workflows/integration_js.yml.disabled +++ b/.github/workflows/integration_js.yml.disabled @@ -71,6 +71,9 @@ jobs: - name: Install dependencies run: pnpm install --no-frozen-lockfile + - name: Install core dependencies + run: cd ./core && pnpm install --no-frozen-lockfile + - name: Build the workspace run: pnpm run build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3f411fb29..c5acef468 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -122,6 +122,9 @@ jobs: - name: pnpm Install run: pnpm install + - name: Install core dependencies + run: cd ./core && pnpm install + - name: Build AD4M-CLI & build Launcher binary (macos/linux-latest) if: matrix.platform != 'windows-latest' env: @@ -313,6 +316,9 @@ jobs: - name: Install deps run: pnpm install + - name: Install core dependencies + run: cd ./core && pnpm install + - name: Install Deno uses: denoland/setup-deno@v1 with: diff --git a/.github/workflows/publish_staging.yml b/.github/workflows/publish_staging.yml index 63152ae9f..a927a72dc 100644 --- a/.github/workflows/publish_staging.yml +++ b/.github/workflows/publish_staging.yml @@ -116,6 +116,9 @@ jobs: - name: pnpm Install run: pnpm install --no-cache + - name: Install core dependencies + run: cd ./core && pnpm install --no-cache + - name: Build AD4M-CLI & build Launcher binary (macos/linux-latest) if: matrix.platform != 'windows-latest' env: @@ -332,6 +335,9 @@ jobs: - name: Install deps run: pnpm install + - name: Install core dependencies + run: cd ./core && pnpm install + - name: Install Deno uses: denoland/setup-deno@v1 with: diff --git a/connect/src/components/Start.ts b/connect/src/components/Start.ts index d480083f8..80625d5b4 100644 --- a/connect/src/components/Start.ts +++ b/connect/src/components/Start.ts @@ -46,17 +46,22 @@ export default function Start({ ` : html`
- Please connect to AD4M once you have downloaded and setup your - AD4M agent + Please connect to ADAM once you have downloaded and setup your + ADAM agent
+ Please make sure you have the ADAM Launcher running on your computer and there are no browser restrictions ("Shields") blocking your connection to ADAM on localhost. + (Safari users: please use a different browser for now. Safari is very strict about this and we are working on a solution.) +
++ ADAM launcher is minimized, click on the tray icon to open it. +
++ This popup will automatically close in 5 seconds. +
+