diff --git a/.github/workflows/_validate-npm.yml b/.github/workflows/_validate-npm.yml index f6a315781..116c1395d 100644 --- a/.github/workflows/_validate-npm.yml +++ b/.github/workflows/_validate-npm.yml @@ -6,6 +6,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} - uses: actions/setup-node@v4 with: node-version: 20.x diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 5f67d8727..1cd74af1a 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -8,14 +8,13 @@ jobs: validate: uses: ./.github/workflows/_validate-npm.yml publish: - uses: aeternity/github-actions/.github/workflows/_publish-docker.yml@v2.1.0 + uses: aeternity/github-actions/.github/workflows/_publish-ecr.yml@v2.3.1 needs: [ validate ] secrets: inherit with: - DOCKERHUB_REPO: "aeternitybot/${{ github.event.repository.name }}" BUILD_ARGS: REVISION=${{ github.sha }} deploy: - uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.1.0 + uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.3.1 needs: [publish] secrets: inherit with: diff --git a/.github/workflows/pull-request-cleanup.yml b/.github/workflows/pull-request-cleanup.yml index 35a4706c6..77b3c785b 100644 --- a/.github/workflows/pull-request-cleanup.yml +++ b/.github/workflows/pull-request-cleanup.yml @@ -7,7 +7,7 @@ on: jobs: rollback: - uses: aeternity/github-actions/.github/workflows/_rollback-gitops.yml@v2.1.0 + uses: aeternity/github-actions/.github/workflows/_rollback-gitops.yml@v2.3.1 secrets: inherit with: DEPLOY_ENV: stg @@ -15,8 +15,11 @@ jobs: DEPLOY_VERSION: "pr-${{ github.event.number }}" DEPLOY_SUBDOMAIN: "pr-${{ github.event.number }}-base" delete-tag: - uses: aeternity/github-actions/.github/workflows/_delete-tag-docker.yml@v2.1.0 + uses: aeternity/github-actions/.github/workflows/_delete-tag-ecr.yml@v2.3.1 secrets: inherit with: - DOCKERHUB_REPO: "aeternitybot/${{ github.event.repository.name }}" DOCKERHUB_TAG: "pr-${{ github.event.number }}" + cleanup: + uses: aeternity/github-actions/.github/workflows/_cleanup-ecr.yml@v2.3.1 + needs: [ delete-tag ] + secrets: inherit diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 1e939ee0c..a6cdd7f4e 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -8,14 +8,13 @@ jobs: validate: uses: ./.github/workflows/_validate-npm.yml publish: - uses: aeternity/github-actions/.github/workflows/_publish-docker.yml@v2.1.0 + uses: aeternity/github-actions/.github/workflows/_publish-ecr.yml@v2.3.1 needs: [ validate ] secrets: inherit with: - DOCKERHUB_REPO: "aeternitybot/${{ github.event.repository.name }}" BUILD_ARGS: REVISION=${{ github.sha }} deploy: - uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.1.0 + uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.3.1 needs: [publish] secrets: inherit with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b9a480d6..d6937d554 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,12 +6,12 @@ on: jobs: publish: - uses: aeternity/github-actions/.github/workflows/_publish-docker.yml@v2.1.0 + uses: aeternity/github-actions/.github/workflows/_publish-ecr.yml@v2.3.1 secrets: inherit with: BUILD_ARGS: REVISION=${{ github.sha }} deploy: - uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.1.0 + uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.3.1 needs: [publish] secrets: inherit with: diff --git a/tests/e2e/specs/browser/__image_snapshots__/Browser opens #0.png b/tests/e2e/specs/browser/__image_snapshots__/Browser opens #0.png index d4a0a06e6..2b25e1235 100644 Binary files a/tests/e2e/specs/browser/__image_snapshots__/Browser opens #0.png and b/tests/e2e/specs/browser/__image_snapshots__/Browser opens #0.png differ diff --git a/tests/e2e/specs/browser/index.cy.js b/tests/e2e/specs/browser/index.cy.js index 8c0f31e75..f0c3b75c8 100644 --- a/tests/e2e/specs/browser/index.cy.js +++ b/tests/e2e/specs/browser/index.cy.js @@ -3,7 +3,14 @@ describe('Browser', () => { cy .viewport('iphone-se2') .visit('/browser', { login: true }); - cy.getIframeBody().find('img').should('be.visible').should('length.gte', 3); + cy.get('.progress-fake').should('not.exist'); + cy.getIframeBody() + .find('img') + .should('be.visible') + .and('length', 4) + .and(($imgs) => Array.from($imgs).forEach((img) => { + expect(img.naturalWidth).to.be.greaterThan(0); + })); cy.matchImage(); }); }); diff --git a/tests/e2e/specs/names/__image_snapshots__/Names shows initial screen #0.png b/tests/e2e/specs/names/__image_snapshots__/Names shows initial screen #0.png index 8e36080b0..84a6afdd2 100644 Binary files a/tests/e2e/specs/names/__image_snapshots__/Names shows initial screen #0.png and b/tests/e2e/specs/names/__image_snapshots__/Names shows initial screen #0.png differ diff --git a/tests/e2e/specs/names/index.cy.js b/tests/e2e/specs/names/index.cy.js index aec070847..f8e7ed920 100644 --- a/tests/e2e/specs/names/index.cy.js +++ b/tests/e2e/specs/names/index.cy.js @@ -3,7 +3,8 @@ describe('Names', () => { cy .viewport('iphone-se2') .visit('/names', { login: true }) - .get('.list-item').should('be.visible'); + .get('.list-item').should('length', 4) + .should('be.visible'); cy.matchImage(); cy.get('[href="/names/ending-soonest"]').should('be.visible'); diff --git a/tests/e2e/specs/transfer/sign-transaction.cy.js b/tests/e2e/specs/transfer/sign-transaction.cy.js index 7f66b0882..96625da90 100644 --- a/tests/e2e/specs/transfer/sign-transaction.cy.js +++ b/tests/e2e/specs/transfer/sign-transaction.cy.js @@ -113,7 +113,7 @@ describe('Sign transaction', () => { .viewport('iphone-se2') .visit(url.href.replace('http://localhost', ''), { login: 'wallet-empty' }); cy.get('button').contains('Confirm').click(); - const skipButton = cy.get('.modal-plain .ae-button.primary'); + const skipButton = cy.get('.modal-plain .ae-button.primary').should('be.visible'); cy.matchImage(); skipButton.click();