Merge branch 'main' into dependabot/npm_and_yarn/plist-3.0.5

athensresearch · Aug 17, 2022 · 1065b43 · 1065b43
2 parents 4059c16 + c7c398a
commit 1065b43
Show file tree

Hide file tree

Showing 200 changed files with 13,729 additions and 6,307 deletions.
diff --git a/.carve/ignore b/.carve/ignore
@@ -39,3 +39,7 @@ athens.common-events.graph.atomic/make-shortcut-move-op
 athens.common-events.graph.schema/valid-atomic-op?
 athens.common-events.graph.schema/explain-atomic-op
 athens.style/unzoom
+athens.self-hosted.fluree.test-helpers/query
+athens.views.jetsam/jetsam-component
+athens.types.tasks.view/new-task
+athens.types.tasks.view/update-task-properties
diff --git a/.clj-kondo/rewrite-clj/rewrite-clj/config.edn b/.clj-kondo/rewrite-clj/rewrite-clj/config.edn
@@ -0,0 +1,5 @@
+{:lint-as
+ {rewrite-clj.zip/subedit-> clojure.core/->
+  rewrite-clj.zip/subedit->> clojure.core/->>
+  rewrite-clj.zip/edit-> clojure.core/->
+  rewrite-clj.zip/edit->> clojure.core/->>}}
diff --git a/.github/custom-actions/clojure-env/action.yml b/.github/custom-actions/clojure-env/action.yml
@@ -24,7 +24,7 @@ runs:
     - name: Prepare java
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
 
     - uses: DeLaGuardo/[email protected]

diff --git a/.github/custom-actions/node-env/action.yml b/.github/custom-actions/node-env/action.yml
@@ -13,9 +13,9 @@ runs:
       id: restore-yarn
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
+        key: ${{ runner.os }}-v1-yarn-${{ hashFiles('yarn.lock') }}
         restore-keys: |
-          ${{ runner.os }}-yarn-
+          ${{ runner.os }}-v1-yarn-
 
     - name: Fetch yarn dependencies
       run: yarn install --frozen-lockfile --network-timeout 10000000

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
        # Keep version and script up to date!
        - uses: DeLaGuardo/setup-clj-kondo@master
          with:
-           version: '2021.08.06'
+           version: '2022.03.09'
 
        - name: Lint
          run: clj-kondo --lint src
@@ -63,6 +63,15 @@ jobs:
        - name: Run Karma tests
          run: yarn client:test
 
+       # TODO: these tests cause the test runner to never exist, so they
+       # can't be ran on CI. Please run them manually for now.
+       # See https://github.com/fluree/db/issues/163.
+       # - name: Start Fluree process
+       #   run: yarn server:fluree
+
+       # - name: Run Fluree tests
+       #   run: yarn server:test:fluree
+
 
    e2e:
      runs-on: ubuntu-latest
@@ -79,9 +88,9 @@ jobs:
          id: restore-shadow-cljs-build-cache
          with:
            path: ./.shadow-cljs
-           key: ${{ runner.os }}-v1-shadow-cljs-build-cache-${{ hashFiles('yarn.lock') }}
+           key: ${{ runner.os }}-v2-shadow-cljs-build-cache-${{ hashFiles('yarn.lock') }}
            restore-keys: |
-             ${{ runner.os }}-v1-shadow-cljs-build-cache
+             ${{ runner.os }}-v2-shadow-cljs-build-cache
 
        - name: Compile JS assets for dev
          run: yarn client:dev-build
@@ -100,13 +109,10 @@ jobs:
        - uses: ./.github/custom-actions/node-env
 
        - name: Compile JS Assets for production
-         run: yarn prod --config-merge "{:closure-defines {athens.core/SENTRY_DSN \"${SENTRY_DSN}\" athens.util/COMMIT_URL \"${COMMIT_URL}\" athens.main.core/AUTO_UPDATE ${AUTO_UPDATE}}}"
+         run: yarn prod --config-merge "{:closure-defines {athens.core/SENTRY_DSN \"${SENTRY_DSN}\" athens.util/COMMIT_URL \"${COMMIT_URL}\"}}"
          env:
            SENTRY_DSN: ${{ secrets.sentry_dsn }}
            COMMIT_URL: "https://github.com/${{github.repository}}/commit/${{github.sha}}"
-           # See athens.main.core/AUTO_UPDATE for more details.
-           # TODO: set to true when publishing auto-update information for 2.0.0-beta.
-           AUTO_UPDATE: false
 
        - name: Run client e2e tests over the prod build
          run: yarn client:e2e
@@ -133,12 +139,22 @@ jobs:
            name: app
            path: resources
 
-       - name: Deploy
-         uses: peaceiris/actions-gh-pages@v3
+       - name: Copy built app to a vercel prod deploy folder
+         run: mkdir -p vercel-release/vercel-static/athens && cp -R resources/public/. vercel-release/vercel-static/athens/
+
+       - uses: amondnet/vercel-action@v20
          with:
-           github_token: ${{ secrets.GITHUB_TOKEN }}
-           publish_dir: ./resources/public
-           force_orphan: true
+           vercel-token: ${{ secrets.VERCEL_TOKEN }}
+           vercel-org-id: ${{ secrets.VERCEL_ORG_ID}}
+           vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID}}
+           scope: athens-research
+           vercel-args: './vercel-release/'
+           # Poor mans ternary operator https://github.com/actions/runner/issues/409#issuecomment-727565588
+           alias-domains: ${{ env.PRERELEASE == 'true' && env.PRERELEASE_DOMAIN || env.RELEASE_DOMAIN }}
+         env:
+           PRERELEASE: ${{ contains(github.ref, '-alpha.') || contains(github.ref, '-beta.') || contains(github.ref, '-rc.')}}
+           PRERELEASE_DOMAIN: beta.athensresearch.org
+           RELEASE_DOMAIN: web.athensresearch.org
 
 
    release-electron:
@@ -151,15 +167,7 @@ jobs:
 
      strategy:
        matrix:
-         os: [ubuntu-latest, windows-latest]
-         electron-arch-overrides: [""]
-         # Separate out the arm64 macos build, those are the longest builds.
-         # package.json still includes configuration to build both targets.
-         include:
-           - os: macos-latest
-             electron-arch-overrides: "-c.mac.target.target=dmg -c.mac.target.arch=x64"
-           - os: macos-latest
-             electron-arch-overrides: "-c.mac.target.target=dmg -c.mac.target.arch=arm64"
+         os: [ubuntu-latest, windows-latest, macos-latest]
 
      steps:
        - uses: actions/checkout@v2
@@ -197,10 +205,6 @@ jobs:
            # release the app after building
            release: ${{ startsWith(github.ref, 'refs/tags/v') }}
 
-           # TODO: remove publishAutoUpdate setting when we think enough 1.0.0-beta
-           # users have updated to 1.0.0, otherwise they will be auto-updated to 2.0.0-beta.
-           args: -c.publish.publishAutoUpdate=false ${{ matrix.electron-arch-overrides }}
-
          env:
            # macOS notarization API key
            API_KEY_ID: ${{ secrets.api_key_id }}
@@ -209,13 +213,19 @@ jobs:
 
    release-server:
      runs-on: ubuntu-latest
-     needs: [test, lint, style, carve]
+     needs: [test, lint, style, carve, build-app]
      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
 
      steps:
        - uses: actions/checkout@v2
        - uses: ./.github/custom-actions/clojure-env
 
+       - name: Download built app
+         uses: actions/download-artifact@v2
+         with:
+           name: app
+           path: resources
+
        - name: Compile server code
          run: yarn server:compile
 

diff --git a/.gitignore b/.gitignore
@@ -53,3 +53,5 @@ vercel-static/*
 !vercel-static/index.html
 !vercel-state/athens/.gitignore
 .vercel
+vercel-release/*
+!vercel-release/package.json