diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be595dc90f..d289ae88e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,30 +73,30 @@ jobs: # run: yarn server:test:fluree - # e2e: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v2 - # - uses: ./.github/custom-actions/clojure-env - # - uses: ./.github/custom-actions/node-env - - # # Caching the build is generally a terrible idea, but e2e is really slow - # # and shadow-cljs is usually pretty good at cache invalidation. - # # Still, if you think this cache is breaking builds, just bump the version number. - # - name: Restore shadow-cljs build cache - # uses: actions/cache@v2 - # id: restore-shadow-cljs-build-cache - # with: - # path: ./.shadow-cljs - # key: ${{ runner.os }}-v2-shadow-cljs-build-cache-${{ hashFiles('yarn.lock') }} - # restore-keys: | - # ${{ runner.os }}-v2-shadow-cljs-build-cache - - # - name: Compile JS assets for dev - # run: yarn client:dev-build - - # - name: Run client e2e tests over dev build - # run: yarn client:e2e + e2e: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: ./.github/custom-actions/clojure-env + - uses: ./.github/custom-actions/node-env + + # Caching the build is generally a terrible idea, but e2e is really slow + # and shadow-cljs is usually pretty good at cache invalidation. + # Still, if you think this cache is breaking builds, just bump the version number. + - name: Restore shadow-cljs build cache + uses: actions/cache@v2 + id: restore-shadow-cljs-build-cache + with: + path: ./.shadow-cljs + key: ${{ runner.os }}-v2-shadow-cljs-build-cache-${{ hashFiles('yarn.lock') }} + restore-keys: | + ${{ runner.os }}-v2-shadow-cljs-build-cache + + - name: Compile JS assets for dev + run: yarn client:dev-build + + - name: Run client e2e tests over dev build + run: yarn client:e2e build-app: diff --git a/deps.edn b/deps.edn index 92e1547458..b20b0191f6 100644 --- a/deps.edn +++ b/deps.edn @@ -49,7 +49,12 @@ cider/cider-nrepl #:mvn{:version "0.27.2"}} :aliases - {:carve + {:shadow-cljs + ;; Increase max JVM stack size. + ;; Without this, the node_modules/highlight.js/lib/languages/isbl.js file will randomly break the e2e CI job + ;; because the Google Closure Compiler can't parse it without busting the stack size. + {:jvm-opts ["-Xss4m"]} + :carve {:extra-deps {borkdude/carve #:git{:url "https://github.com/borkdude/carve" :sha "7d87e7fdf471121b4f3cc4b442e6ca39503ca07e"}} diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 96982ee616..bbf931b5f5 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -1,4 +1,4 @@ -{:deps true +{:deps {:aliases [:shadow-cljs]} ;; Don't install npm-deps declared in dependencies. ;; If we need them, we install them manually. ;; https://github.com/thheller/shadow-cljs/issues/800#issuecomment-725716087