Merge pull request #712 from input-output-hk/plt-7541-separate-plutus

PLT-7541 Pull plutus scripts into separate repo
input-output-hk · Sep 15, 2023 · 4c96afa · 4c96afa
2 parents 07ef19c + 7d9e5d5
commit 4c96afa
Show file tree

Hide file tree

Showing 250 changed files with 1,380 additions and 4,022 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,29 +10,6 @@ on:
       - main
   workflow_call:
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the code
-        uses: actions/checkout@v3
-      - name: Install Nix
-        uses: cachix/install-nix-action@v21
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-          install_url: https://releases.nixos.org/nix/nix-2.10.3/install
-          extra_nix_config: |
-            allowed-uris = ${{ env.ALLOWED_URIS }}
-            trusted-public-keys = ${{ env.TRUSTED_PUBLIC_KEYS }}
-            substituters = ${{ env.SUBSTITUTERS }}
-            experimental-features = nix-command flakes
-      - name: Setup Cachix
-        uses: cachix/cachix-action@v12
-        with:
-          name: ${{ env.CACHE_NAME }}
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-      - name: Clean Build on Ubuntu
-        run: |
-          nix develop --show-trace --command bash -c "cabal clean && cabal update && cabal build all"
   integration:
     runs-on: ubuntu-latest
     services:
@@ -65,18 +42,40 @@ jobs:
         with:
           name: ${{ env.CACHE_NAME }}
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-      - name: Run tests
+      - name: Evaluate test derivation
+        run: |
+          nix build --dry-run --json .#integration-tests > test-store-path.json
+      - name: Cache test results
+        id: cache-results
+        uses: actions/cache@v3
+        with:
+          # Use run_attempt in the cache key so that explicitly re-running the
+          # tests will force the test to run again.
+          key: ${{ runner.os }}-integration-tests-${{ hashFiles('test-store-path.json') }}-${{ github.run_attempt }}
+          path: |
+            ~/integration-tests.log
+            ~/integration-tests.status
+      - if: ${{ steps.cache-results.outputs.cache-hit != 'true' }}
+        name: Run tests
         run: |
-          nix run .#integration-tests --show-trace -- --strict
+          nix run .#integration-tests --show-trace -- --strict > ~/integration-tests.log
+          echo $? > ~/integration-tests.status
+          exit $?
         env:
           MARLOWE_RT_TEST_DB_HOST: localhost
           MARLOWE_RT_TEST_CLEANUP_DATABASE: "False"
           MARLOWE_RT_TEST_SUBMIT_CONFIRMATION_BLOCKS: 0
-      - name: Upload failed test directories as artifacts
-        if: ${{ failure() }}
+      - if: ${{ failure() && steps.cache-results.outputs.cache-hit != 'true' }}
+        name: Upload failed test directories as artifacts
         uses: actions/upload-artifact@v3
         with:
           name: workspaces
           path: |
             /tmp/workspaces
             !/tmp/workspaces/**/*.socket
+      - if: ${{ steps.cache-results.outputs.cache-hit == 'true' }}
+        name: Display cached test results
+        run: |
+          echo "Using cached test results. Test log:"
+          cat ~/integration-tests.log
+          exit $(cat ~/integration-tests.status)
diff --git a/cabal.project b/cabal.project
@@ -36,7 +36,6 @@ packages:
   marlowe-integration
   marlowe-integration-tests
   marlowe-object
-  marlowe-plutus
   marlowe-protocols
   marlowe-runtime
   marlowe-runtime-cli