diff --git a/.github/workflows/ci-cd-trigger.yml b/.github/workflows/ci-cd-trigger.yml index 8d222b90c..67116dfdf 100644 --- a/.github/workflows/ci-cd-trigger.yml +++ b/.github/workflows/ci-cd-trigger.yml @@ -113,15 +113,16 @@ jobs: preview_governance="not deployed" preview_trading="not deployed" preview_explorer="not deployed" - if [[ $affected == *"governance"* ]]; then + preview_tools="not deployed" + if [[ $affected =~ *"governance"* ]]; then projects_e2e+='"governance-e2e" ' preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug") fi - if [[ $affected == *"trading"* ]]; then + if [[ $affected =~ *"trading"* ]]; then projects_e2e+='"trading-e2e" ' preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug") fi - if [[ $affected == *"explorer"* ]]; then + if [[ $affected =~ *"explorer"* ]]; then projects_e2e+='"explorer-e2e" ' preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug") fi @@ -135,9 +136,17 @@ jobs: projects_e2e=[${projects_e2e// /,}] echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV + if [[ $affected =~ *"mutlisig-signer"* ]]; then + # tools are only applicable to check previews or deploy from develop to mainnet + if [[ "${{ github.event_name }}" = "pull_request" ]] || [[ "${{ github.ref_name }}" = "develop" ]]; then + preview_tools=$(printf "https://%s.%s.vega.rocks" "tools" "$branch_slug") + PROJECTS+='"multisig-signer" ' + fi + fi echo PREVIEW_GOVERNANCE=$preview_governance >> $GITHUB_ENV echo PREVIEW_TRADING=$preview_trading >> $GITHUB_ENV echo PREVIEW_EXPLORER=$preview_explorer >> $GITHUB_ENV + echo PREVIEW_TOOLS=$preview_tools >> $GITHUB_ENV outputs: projects: ${{ env.PROJECTS }} @@ -145,6 +154,7 @@ jobs: preview_governance: ${{ env.PREVIEW_GOVERNANCE }} preview_trading: ${{ env.PREVIEW_TRADING }} preview_explorer: ${{ env.PREVIEW_EXPLORER }} + preview_tools: ${{ env.PREVIEW_TOOLS }} cypress: needs: lint-test-build @@ -203,6 +213,12 @@ jobs: sleep 5 done fi + if [[ "${{ needs.lint-test-build.outputs.preview_tools }}" =~ $regex ]]; then + until curl -L --fail "${{ needs.lint-test-build.outputs.preview_tools }}"; do + echo "waiting for tools preview" + sleep 5 + done + fi - name: Create comment uses: peter-evans/create-or-update-comment@v3 @@ -214,6 +230,7 @@ jobs: * governance: ${{ needs.lint-test-build.outputs.preview_governance }} * explorer: ${{ needs.lint-test-build.outputs.preview_explorer }} * trading: ${{ needs.lint-test-build.outputs.preview_trading }} + * tools: ${{ needs.lint-test-build.outputs.preview_tools }} # Report single result at the end, to avoid mess with required checks in PR cypress-check: diff --git a/.github/workflows/publish-dist.yml b/.github/workflows/publish-dist.yml index c7183f286..1b4a98038 100644 --- a/.github/workflows/publish-dist.yml +++ b/.github/workflows/publish-dist.yml @@ -70,6 +70,10 @@ jobs: envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)" elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then envName="stagnet1" + if [[ "${matrix.app}" = "multisig-signer" ]]; then + envName="mainnet" + bucketName="tools.vega.xyz" + fi elif [[ "${{ github.ref }}" =~ .*main$ ]]; then envName="mainnet" elif [[ "${{ matrix.app}}" = "trading" ]] && [[ "${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }}" = "true" ]]; then diff --git a/docker/nginx.conf b/docker/nginx.conf index 40a878bce..fd15608db 100644 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -3,6 +3,7 @@ server { listen 80; location / { + add_header 'Cache-Control' 'max-age=60'; root /usr/share/nginx/html; index index.html index.htm; try_files $uri $uri/ /index.html;