Skip to content

Commit 2f36cee

Browse files
committed
refactor: Consolidate propose-to-safe jobs and implement matrix strategy for transaction handling
1 parent e37f2cb commit 2f36cee

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

.github/workflows/transfer-admin-role-safe.yml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -141,28 +141,23 @@ jobs:
141141
echo "ℹ️ Re-run with dry_run=false to actually propose to Safe"
142142
fi
143143
144-
propose-token-to-safe-tx:
144+
propose-to-safe-tx:
145145
needs: prepare-transaction-calldata
146146
if: ${{ inputs.dry_run == false }}
147+
strategy:
148+
matrix:
149+
transaction-index: [0, 1]
150+
include:
151+
- transaction-index: 0
152+
contract-name: token
153+
- transaction-index: 1
154+
contract-name: bridge
147155
uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/propose-safe-multisig-tx.yml@main
148156
secrets:
149157
safe-proposer-private-key: ${{ secrets.SAFE_PROPOSER_PRIVATE_KEY }}
150158
safe-api-key: ${{ secrets.SAFE_API_KEY }}
151159
with:
152160
rpc-url: ${{ github.secrets.RPC_URL }}
153161
safe-address: ${{ needs.prepare-transaction-calldata.outputs.safe-address }}
154-
transaction-to: ${{ fromJson(needs.prepare-transaction-calldata.outputs.transactions)[0].to }}
155-
transaction-data: ${{ fromJson(needs.prepare-transaction-calldata.outputs.transactions)[0].data }}
156-
157-
propose-bridge-to-safe-tx:
158-
needs: prepare-transaction-calldata
159-
if: ${{ inputs.dry_run == false }}
160-
uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/propose-safe-multisig-tx.yml@main
161-
secrets:
162-
safe-proposer-private-key: ${{ secrets.SAFE_PROPOSER_PRIVATE_KEY }}
163-
safe-api-key: ${{ secrets.SAFE_API_KEY }}
164-
with:
165-
rpc-url: ${{ github.secrets.RPC_URL }}
166-
safe-address: ${{ needs.prepare-transaction-calldata.outputs.safe-address }}
167-
transaction-to: ${{ fromJson(needs.prepare-transaction-calldata.outputs.transactions)[1].to }}
168-
transaction-data: ${{ fromJson(needs.prepare-transaction-calldata.outputs.transactions)[1].data }}
162+
transaction-to: ${{ fromJson(needs.prepare-transaction-calldata.outputs.transactions)[matrix.transaction-index].to }}
163+
transaction-data: ${{ fromJson(needs.prepare-transaction-calldata.outputs.transactions)[matrix.transaction-index].data }}

0 commit comments

Comments
 (0)