diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 277d75bdb..32a5f8363 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -33,6 +33,7 @@ jobs: name: "Deploy Preview" needs: - build + - branch-sha runs-on: "ubuntu-latest" concurrency: group: ${{ github.ref }}-deploy-preview @@ -52,8 +53,8 @@ jobs: - name: Trigger a preview Deploy run: | sleep 30s - mkdir -p preview/${{ needs.build.outputs.branch-sha }} - pushd preview/${{ needs.build.outputs.branch-sha }} + mkdir -p preview/${{ needs.branch-sha.outputs.value }} + pushd preview/${{ needs.branch-sha.outputs.value }} [[ ! -f .latest ]] && touch .latest [[ ! -f .artifacts ]] && touch .artifacts cat .latest >> .artifacts @@ -61,4 +62,4 @@ jobs: git add .artifacts .latest git commit -m"Update preview artifacts ${{ needs.build.outputs.pkg-version }}" git push - echo "The preview URL is: ${{ vars.PREVIEW_ROOT_URL }}/${{ needs.build.outputs.branch-sha }}/" >> ${GITHUB_STEP_SUMMARY} + echo "The preview URL is: ${{ vars.PREVIEW_ROOT_URL }}/${{ needs.branch-sha.outputs.value }}/" >> ${GITHUB_STEP_SUMMARY} diff --git a/.github/workflows/testnet.yml b/.github/workflows/testnet.yml index 45d854bbd..cf1579d32 100644 --- a/.github/workflows/testnet.yml +++ b/.github/workflows/testnet.yml @@ -33,6 +33,7 @@ jobs: name: "Deploy Testnet" needs: - build + - branch-sha runs-on: "ubuntu-latest" concurrency: group: ${{ github.ref }}-deploy-testnet @@ -52,8 +53,8 @@ jobs: - name: Trigger a testnet Deploy run: | sleep 30s - mkdir -p testnet/${{ needs.build.outputs.branch-sha }} - pushd testnet/${{ needs.build.outputs.branch-sha }} + mkdir -p testnet/${{ needs.branch-sha.outputs.value }} + pushd testnet/${{ needs.branch-sha.outputs.value }} [[ ! -f .latest ]] && touch .latest [[ ! -f .artifacts ]] && touch .artifacts cat .latest >> .artifacts @@ -61,4 +62,4 @@ jobs: git add .artifacts .latest git commit -m"Update testnet artifacts ${{ needs.build.outputs.pkg-version }}" git push - echo "The testnet URL is: ${{ vars.TESTNET_ROOT_URL }}/${{ needs.build.outputs.branch-sha }}/" >> ${GITHUB_STEP_SUMMARY} \ No newline at end of file + echo "The testnet URL is: ${{ vars.TESTNET_ROOT_URL }}/${{ needs.branch-sha.outputs.value }}/" >> ${GITHUB_STEP_SUMMARY} \ No newline at end of file diff --git a/apps/connect/vite.token-bridge.config.ts b/apps/connect/vite.token-bridge.config.ts index 7dbdd1df5..62ae25b6a 100644 --- a/apps/connect/vite.token-bridge.config.ts +++ b/apps/connect/vite.token-bridge.config.ts @@ -5,17 +5,20 @@ const PUBLIC_URL = viteConfig.base; const ADVANCE_TOOLS_HREF = `${PUBLIC_URL}/advanced-tools/#/transfer` const ADVANCE_TOOLS_HREF_TEMPLATE = `${ADVANCE_TOOLS_HREF}?sourceChain={:sourceChain}&targetChain={:targetChain}` - +const USDC_BRIDGE_HREF = `${PUBLIC_URL}/usdc-bridge/` // https://vitejs.dev/config/ export default defineConfig({ ...viteConfig, define: { navBar: [ { label: "Home", active: true, href: `${PUBLIC_URL}/` }, - { label: "USDC", href: `${PUBLIC_URL}/usdc-bridge` } + { label: "USDC", href: USDC_BRIDGE_HREF } ], wormholeConnectConfig: { ...viteConfig?.define?.wormholeConnectConfig, + cctpWarning: { + href: USDC_BRIDGE_HREF + }, moreNetworks: { href: ADVANCE_TOOLS_HREF_TEMPLATE, target: "_blank",