Fix

storyprotocol · Jan 5, 2024 · 661e884 · 661e884
1 parent c1eaa00
commit 661e884
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 32 deletions.
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -6,6 +6,9 @@ on:
       sha:
         required: true
         type: string
+      ENVIRONMENT: 
+        required: true
+        type: string
     secrets:
       API_BASE_URL:
         required: true
@@ -57,6 +60,8 @@ jobs:
     name: Build and Test
     timeout-minutes: 15
     runs-on: ubuntu-latest
+    ## Example to fix envrionment secret not passing in: https://github.com/AllanOricil/workflow-template-bug/blob/master/.github/workflows/workflow-template-fix-without-required-secret.yml
+    environment: ${{ inputs.ENVIRONMENT }}
     env:
       ## To use Remote Caching, uncomment the next lines and follow the steps below.
       # TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}

diff --git a/.github/workflows/external-pr.yaml b/.github/workflows/external-pr.yaml
@@ -13,10 +13,10 @@ jobs:
       - run: true
   build_and_test:
     needs: authorize
-    environment: 'alpha-sepolia'
     uses: ./.github/workflows/build-and-test.yaml 
     with: 
       sha: ${{ github.event.pull_request.head.sha }}
+      ENVIRONMENT: 'alpha-sepolia'
     secrets:
       API_BASE_URL: ${{ secrets.API_BASE_URL }} 
       STORY_PROTOCOL_CONTRACT: ${{ secrets.STORY_PROTOCOL_CONTRACT }}

diff --git a/.github/workflows/internal-pr.yaml b/.github/workflows/internal-pr.yaml
@@ -12,34 +12,30 @@ on:
 
 jobs:
   build_and_test:
-    if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
-    runs-on: ubuntu-latest
-    environment: 'alpha-sepolia'
-    steps:
-    - name: Trigger the build-and-test workflow
-      uses: ./.github/workflows/build-and-test.yaml 
-      with: 
-        sha: ${{ github.event.pull_request.head.sha }}
-      secrets:
-        API_BASE_URL: ${{ secrets.API_BASE_URL }} 
-        STORY_PROTOCOL_CONTRACT: ${{ secrets.STORY_PROTOCOL_CONTRACT }}
-        IP_ASSET_REGISTRY_CONTRACT: ${{ secrets.IP_ASSET_REGISTRY_CONTRACT }} 
-        IP_ORG_CONTROLLER_CONTRACT: ${{ secrets.IP_ORG_CONTROLLER_CONTRACT }}
-        RELATIONSHIP_MODULE_CONTRACT: ${{ secrets.RELATIONSHIP_MODULE_CONTRACT }}
-        REGISTRATION_MODULE_CONTRACT: ${{ secrets.REGISTRATION_MODULE_CONTRACT }}
-        LICENSE_REGISTRY_CONTRACT: ${{ secrets.LICENSE_REGISTRY_CONTRACT }}
-        MODULE_REGISTRY_CONTRACT: ${{ secrets.MODULE_REGISTRY_CONTRACT }}
-        LICENSE_MODULE_CONTRACT: ${{ secrets.LICENSE_MODULE_CONTRACT }}
-        RPC_PROVIDER_URL: ${{ secrets.RPC_PROVIDER_URL }}
-        WALLET_PRIVATE_KEY: ${{ secrets.WALLET_PRIVATE_KEY }}
-        TEST_WALLET_ADDRESS: ${{ secrets.TEST_WALLET_ADDRESS }}
-        TEST_IPORG_ID: ${{ secrets.TEST_IPORG_ID }}
-        TEST_IPORG_ID_WITH_HOOK: ${{ secrets.TEST_IPORG_ID_WITH_HOOK }}
-        TEST_IPASSET_ID1: ${{ secrets.TEST_IPASSET_ID1 }}
-        TEST_IPASSET_ID2: ${{ secrets.TEST_IPASSET_ID2 }}
-        TEST_RELATIONSHIP_ID: ${{ secrets.TEST_RELATIONSHIP_ID }}
-        TEST_RELATIONSHIP_TYPE: ${{ secrets.TEST_RELATIONSHIP_TYPE }}
-        TEST_LICENSE_ID: ${{ secrets.TEST_LICENSE_ID }}
-        TEST_HOOK_ID: ${{ secrets.TEST_HOOK_ID }}
-        TEST_MODULE_ID: ${{ secrets.TEST_MODULE_ID }}
-        TEST_TRANSACTION_ID: ${{ secrets.TEST_TRANSACTION_ID }}
+    uses: ./.github/workflows/build-and-test.yaml 
+    with: 
+      sha: ${{ github.event.pull_request.head.sha }}
+      ENVIRONMENT: 'alpha-sepolia' 
+    secrets:
+      API_BASE_URL: ${{ secrets.API_BASE_URL }} 
+      STORY_PROTOCOL_CONTRACT: ${{ secrets.STORY_PROTOCOL_CONTRACT }}
+      IP_ASSET_REGISTRY_CONTRACT: ${{ secrets.IP_ASSET_REGISTRY_CONTRACT }} 
+      IP_ORG_CONTROLLER_CONTRACT: ${{ secrets.IP_ORG_CONTROLLER_CONTRACT }}
+      RELATIONSHIP_MODULE_CONTRACT: ${{ secrets.RELATIONSHIP_MODULE_CONTRACT }}
+      REGISTRATION_MODULE_CONTRACT: ${{ secrets.REGISTRATION_MODULE_CONTRACT }}
+      LICENSE_REGISTRY_CONTRACT: ${{ secrets.LICENSE_REGISTRY_CONTRACT }}
+      MODULE_REGISTRY_CONTRACT: ${{ secrets.MODULE_REGISTRY_CONTRACT }}
+      LICENSE_MODULE_CONTRACT: ${{ secrets.LICENSE_MODULE_CONTRACT }}
+      RPC_PROVIDER_URL: ${{ secrets.RPC_PROVIDER_URL }}
+      WALLET_PRIVATE_KEY: ${{ secrets.WALLET_PRIVATE_KEY }}
+      TEST_WALLET_ADDRESS: ${{ secrets.TEST_WALLET_ADDRESS }}
+      TEST_IPORG_ID: ${{ secrets.TEST_IPORG_ID }}
+      TEST_IPORG_ID_WITH_HOOK: ${{ secrets.TEST_IPORG_ID_WITH_HOOK }}
+      TEST_IPASSET_ID1: ${{ secrets.TEST_IPASSET_ID1 }}
+      TEST_IPASSET_ID2: ${{ secrets.TEST_IPASSET_ID2 }}
+      TEST_RELATIONSHIP_ID: ${{ secrets.TEST_RELATIONSHIP_ID }}
+      TEST_RELATIONSHIP_TYPE: ${{ secrets.TEST_RELATIONSHIP_TYPE }}
+      TEST_LICENSE_ID: ${{ secrets.TEST_LICENSE_ID }}
+      TEST_HOOK_ID: ${{ secrets.TEST_HOOK_ID }}
+      TEST_MODULE_ID: ${{ secrets.TEST_MODULE_ID }}
+      TEST_TRANSACTION_ID: ${{ secrets.TEST_TRANSACTION_ID }}