fix: environment variables (#36)

Signed-off-by: Simon Paitrault <[email protected]>
topos-protocol · Feb 29, 2024 · 66c2a6a · 66c2a6a
1 parent fbe2421
commit 66c2a6a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/frontend:erc20-messaging.yml b/.github/workflows/frontend:erc20-messaging.yml
@@ -30,7 +30,7 @@ on:
         required: false
 
 env:
-  E2E_TEST_TYPE: ${{ inputs.e2e-test-type }}
+  E2E_TEST_TYPE: ${{ inputs.e2e-test-type || 'light' }}
   TOPOS_DOCKER_TAG: ${{ inputs.topos-docker-tag || 'latest' }}
   CONTRACTS_DOCKER_TAG: ${{ inputs.topos-smart-contracts-docker-tag || 'latest' }}
   EXECUTOR_SERVICE_DOCKER_TAG: ${{ inputs.executor-service-docker-tag || 'latest' }}
@@ -60,6 +60,7 @@ jobs:
     steps:
       - name: Display stack component versions
         run: |
+          echo "event type: ${{ github.event_name }}"
           echo "infra ref: ${{ env.INFRA_REF }}"
           echo "frontend ref: ${{ env.FRONTEND_REF }}"
           echo "topos docker tag: ${{ env.TOPOS_DOCKER_TAG }}"

diff --git a/.github/workflows/topos:integration-tests.yml b/.github/workflows/topos:integration-tests.yml
@@ -67,10 +67,17 @@ jobs:
           cd infra &&
           npm install
 
+      - name: Setup environment
+        run: |
+          cd infra
+          cat .env | grep -v '^\s*$\|^\s*\#' | xargs -I {} echo "{}" >> $GITHUB_ENV
+          echo "LOCAL_ERC20_HOME=${PWD}" >> $GITHUB_ENV
+          echo "TOPOS_MESSAGING_PROTOCOL_CONTRACTS_VERSION=${{ env.CONTRACTS_DOCKER_TAG }}" >> $GITHUB_ENV
+          echo "TOPOS_VERSION=${{ env.TOPOS_DOCKER_TAG }}" >> $GITHUB_ENV
+
       - name: Start local ERC20 messaging infra containers
         run: >
           cd infra &&
-          source .env &&
           ./tests/network.sh start
         env:
           PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
@@ -79,8 +86,6 @@ jobs:
           TOPOS_CORE_PROXY_SALT: ${{ secrets.TOPOS_CORE_PROXY_SALT }}
           ERC20_MESSAGING_SALT: ${{ secrets.ERC20_MESSAGING_SALT }}
           SUBNET_REGISTRATOR_SALT: ${{ secrets.SUBNET_REGISTRATOR_SALT }}        
-          TOPOS_VERSION: ${{ env.TOPOS_DOCKER_TAG }}
-          TOPOS_MESSAGING_PROTOCOL_CONTRACTS_VERSION: ${{ env.CONTRACTS_DOCKER_TAG }}
 
       - name: Debug containers
         if: failure()
@@ -98,7 +103,6 @@ jobs:
       - name: Run network health check tests
         run: >
           cd infra &&
-          source .env &&
           ./tests/test_network_health.sh
         env:
           DOCKER_DEFAULT_PLATFORM: linux/amd64
@@ -112,7 +116,6 @@ jobs:
       - name: Run certificates production tests
         run: >
           cd infra &&
-          source .env &&
           ./tests/test_cert_production.sh
         env:
           DOCKER_DEFAULT_PLATFORM: linux/amd64
@@ -126,7 +129,6 @@ jobs:
       - name: Run certificate delivery test
         run: >
           cd infra &&
-          source .env &&
           ./tests/test_cert_delivery.sh
         env:
           DOCKER_DEFAULT_PLATFORM: linux/amd64
@@ -140,7 +142,6 @@ jobs:
       - name: Run transaction included in certificate test
         run: >
           cd infra &&
-          source .env &&
           ./tests/test_transaction_in_certificate.sh
         env:
           DOCKER_DEFAULT_PLATFORM: linux/amd64
@@ -154,7 +155,6 @@ jobs:
       - name: Run target sequencer cert delivery test
         run: >
           cd infra &&
-          source .env &&
           ./tests/test_cert_sequencer_delivery.sh
         env:
           DOCKER_DEFAULT_PLATFORM: linux/amd64
@@ -168,7 +168,6 @@ jobs:
       - name: Run certificate inclusion test
         run: >
           cd infra &&
-          source .env &&
           ./tests/test_cert_inclusion.sh
         env:
           DOCKER_DEFAULT_PLATFORM: linux/amd64