Merge branch 'main' into test/cap-nonce

input-output-hk · Sep 13, 2024 · 562b524 · 562b524
2 parents 2631ff3 + 1b24d56
commit 562b524
Show file tree

Hide file tree

Showing 87 changed files with 4,120 additions and 1,550 deletions.
diff --git a/.config/rustdoc.env b/.config/rustdoc.env
@@ -1,4 +1,3 @@
 # TODO: Enable these docs flags.
 # RUSTDOCFLAGS=-D rustdoc::broken-intra-doc-links -D missing_docs -D rustdoc::missing_crate_level_docs
 RUSTDOCFLAGS=-D rustdoc::invalid_codeblock_attributes -D rustdoc::invalid_html_tags -D rustdoc::invalid_rust_codeblocks -D rustdoc::bare_urls
-
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -119,6 +119,11 @@ jobs:
         working-directory: "C:\\${{ github.event.repository.name }}"
         run: choco install -y protoc openssl sqlite postgresql14
 
+      - uses: actions/upload-artifact@v4
+        with:
+          name: choco_logs
+          path: C:\ProgramData\chocolatey\logs\*
+
       - name: Set PostgreSQL env variables
         working-directory: "C:\\${{ github.event.repository.name }}"
         shell: powershell

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - main
-      - fix-earthly-integration-testing
 
 permissions:
   id-token: write
@@ -41,4 +40,4 @@ jobs:
         env:
           EARTHLY_SECRETS: "IDEASCALE_EMAIL=${{ secrets.IDEASCALE_EMAIL }}, IDEASCALE_PASSWORD=${{ secrets.IDEASCALE_PASSWORD }}, IDEASCALE_API_TOKEN=${{ secrets.IDEASCALE_API_TOKEN }}"
         run: |
-          earthly -P --buildkit-host "tcp://${{ secrets.EARTHLY_SATELLITE_ADDRESS }}:8372" +test
+          earthly -P --buildkit-host "tcp://${{ secrets.EARTHLY_SATELLITE_ADDRESS }}:8372" +test-all
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,110 +2,22 @@ name: CI
 
 on:
   push:
-    branches:
-        - main
-    paths:
-        - ".github/workflows/ci.yml"
-        - "containers/**"
-        - "services/**"
-        - "src/**"
-        - "utilities/**"
 
 permissions:
   id-token: write
-  contents: read
+  contents: write
   packages: write
 
-env:
-  AWS_REGION: eu-central-1
-  AWS_ROLE_ARN: arn:aws:iam::332405224602:role/ci
-  EARTHLY_TARGET: docker
-  EARTHLY_VERSION: 0.7.6
-  ECR_REGISTRY: 332405224602.dkr.ecr.eu-central-1.amazonaws.com
-  TAG: ${{ github.sha }}
-
 jobs:
-  discover:
-    runs-on: ubuntu-latest
-    outputs:
-      json: ${{ steps.discover.outputs.json}}
-      images: ${{ steps.discover.outputs.images}}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup CI
-        uses: input-output-hk/catalyst-ci/actions/setup@master
-        with:
-          aws_role_arn: ${{ env.AWS_ROLE_ARN }}
-          aws_region: ${{ env.AWS_REGION }}
-          earthly_version: ${{ env.EARTHLY_VERSION }}
-      - name: Discover Earthfiles
-        uses: input-output-hk/catalyst-ci/actions/discover@master
-        id: discover
-        with:
-          parse_images: "true"
-          targets: ${{ env.EARTHLY_TARGET }}
-  cache:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup CI
-        uses: input-output-hk/catalyst-ci/actions/setup@master
-        with:
-          aws_role_arn: ${{ env.AWS_ROLE_ARN }}
-          aws_region: ${{ env.AWS_REGION }}
-          earthly_version: ${{ env.EARTHLY_VERSION }}
-      - name: Build cache
-        uses: input-output-hk/catalyst-ci/actions/build@master
-        with:
-          earthfile: .
-          earthly_satellite: ${{ secrets.EARTHLY_SATELLITE_ADDRESS }}
-          target: builder
-  build:
-    runs-on: ubuntu-latest
-    needs: [cache, discover]
-    strategy:
-      fail-fast: false
-      matrix:
-        earthfile: ${{ fromJson(needs.discover.outputs.json) }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup CI
-        uses: input-output-hk/catalyst-ci/actions/setup@master
-        with:
-          aws_role_arn: ${{ env.AWS_ROLE_ARN }}
-          aws_region: ${{ env.AWS_REGION }}
-          earthly_version: ${{ env.EARTHLY_VERSION }}
-      - name: Login to ECR
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.ECR_REGISTRY }}
-      - name: Build and publish
-        uses: input-output-hk/catalyst-ci/actions/build@master
-        with:
-          earthfile: ${{ matrix.earthfile.path }}
-          earthly_satellite: ${{ secrets.EARTHLY_SATELLITE_ADDRESS }}
-          images: ${{ matrix.earthfile.images }}
-          publish: "true"
-          registry: ${{ env.ECR_REGISTRY }}
-          tags: "${{ env.TAG }}"
-          target: ${{ env.EARTHLY_TARGET }}
-  deploy:
-    runs-on: ubuntu-latest
-    needs: [discover, build]
-    steps:
-      - name: Setup CI
-        uses: input-output-hk/catalyst-ci/actions/setup@master
-        id: setup
-        with:
-          aws_role_arn: ${{ env.AWS_ROLE_ARN }}
-          aws_region: ${{ env.AWS_REGION }}
-          earthly_version: ${{ env.EARTHLY_VERSION }}
-      - name: Deploy
-        uses: input-output-hk/catalyst-ci/actions/deploy@master
-        with:
-          deployment_repo: input-output-hk/catalyst-world
-          # NOTE: For new services being deployed, this list must be updated
-          images: cat-data-service fragment-exporter migrations voting-node
-          environment: dev
-          tag: ${{ env.TAG }}
-          token: ${{ steps.setup.outputs.token }}
+  ci:
+    uses: input-output-hk/catalyst-ci/.github/workflows/ci.yml@master
+    with:
+      aws_ecr_registry: 332405224602.dkr.ecr.eu-central-1.amazonaws.com
+      aws_role_arn: arn:aws:iam::332405224602:role/ci
+      aws_region: eu-central-1
+      publish_docs: false
+    secrets:
+      dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
+      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+      earthly_runner_address: ${{ secrets.EARTHLY_SATELLITE_ADDRESS }}
+      earthly_runner_secret: ${{ secrets.EARTHLY_RUNNER_SECRET }}
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -226,10 +226,10 @@ jobs:
         uses: taiki-e/install-action@nextest
 
       - name: Install cargo-make
-        run: cargo install --force cargo-make
+        run: cargo install --force cargo-make --version 0.37.10 --locked
 
       - name: Install refinery
-        run: cargo install refinery_cli
+        run: cargo install refinery_cli --version 0.8.7 --locked
 
       - name: Install dependencies
         run:
@@ -268,16 +268,16 @@ jobs:
             --exclude wallet-uniffi \
             --archive-file nextest-archive.tar.zst
 
-      - name: Run Catalyst Core tests
-        env:
-          TEST_DATABASE_URL: postgres://postgres:123456@localhost
-          EVENT_DB_URL: postgres://catalyst-event-dev:CHANGE_ME@localhost/CatalystEventDev
+      ## - name: Run Catalyst Core tests
+      ##  env:
+      ##    TEST_DATABASE_URL: postgres://postgres:123456@localhost
+      ##    EVENT_DB_URL: postgres://catalyst-event-dev:CHANGE_ME@localhost/CatalystEventDev
         ## removing test ui_test because of bug https://github.com/rust-lang/cargo/issues/10352
-        run: |
-          cargo nextest run \
-          -E "not (test(ui_test))" \
-          --archive-file nextest-archive.tar.zst --extract-to ${{ github.workspace }} \
-          --extract-overwrite --partition hash:${{ matrix.partition }}/10 --profile ci
+      ##   run: |
+      ##    cargo nextest run \
+      ##    -E "not (test(ui_test))" \
+      ##    --archive-file nextest-archive.tar.zst --extract-to ${{ github.workspace }} \
+      ##    --extract-overwrite --partition hash:${{ matrix.partition }}/10 --profile ci
 
   test-results:
     if: always()

diff --git a/.gitignore b/.gitignore
@@ -117,5 +117,8 @@ tests/tmp/
 lefthook.yml
 treefmt.toml
 
-# local earthly Environments
-local/*
+# local earthly environments
+local/*
+tests/wallet-automation/typhon/usrdatadir/*
+tests/wallet-automation/node_modules/*
+tests/wallet-automation/typhon/extensions/*