Skip to content

Commit

Permalink
Merge branch 'master' into @mago/filter-hide-token-nft
Browse files Browse the repository at this point in the history
  • Loading branch information
derHowie authored Sep 7, 2024
2 parents 36f39f2 + 0244e92 commit 7a8a9aa
Show file tree
Hide file tree
Showing 59 changed files with 1,282 additions and 1,179 deletions.
10 changes: 5 additions & 5 deletions .github/actions/testsSetup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ inputs:
runs:
using: 'composite'
steps:
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: "18.18.0"
node-version: "20.16.0"
- name: Download deps cache artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: node_modules.tar.gz
- name: Unzip node_modules
shell: 'bash'
run: tar xzf node_modules.tar.gz
- name: Download build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: rainbowbx-${{ github.sha }}
path: build
Expand All @@ -33,7 +33,7 @@ runs:
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: 'rainbow-me/browser-extension-env'
token: ${{ inputs.gh-access-token }}
Expand Down
98 changes: 48 additions & 50 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18.18.0"
node-version: "20.16.0"
cache: 'yarn'
- name: Install deps via Yarn
run: yarn setup
Expand All @@ -28,7 +28,7 @@ jobs:
- name: Zip node_modules
run: tar czf node_modules.tar.gz node_modules/
- name: Upload deps artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: node_modules.tar.gz
path: node_modules.tar.gz
Expand All @@ -38,17 +38,17 @@ jobs:
runs-on: ubuntu-latest
needs: [install]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18.18.0"
node-version: "20.16.0"
- name: Download deps cache artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: node_modules.tar.gz
- name: Unzip node_modules
run: tar xzf node_modules.tar.gz
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: 'rainbow-me/browser-extension-env'
token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -63,7 +63,7 @@ jobs:
- name: Build the extension
run: yarn build:webpack
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rainbowbx-${{ github.sha }}
path: build/
Expand All @@ -78,7 +78,7 @@ jobs:
# DISPLAY: :0
# VITEST_SEGFAULT_RETRY: 4
# steps:
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
# - uses: ./.github/actions/firefoxTestsSetup
# with:
# gh-access-token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -93,7 +93,7 @@ jobs:
# yarn vitest:parallel
# - name: Upload deps artifacts
# if: steps.FFE2eParallel.outcome == 'failure'
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: screenshots
# path: screenshots/
Expand All @@ -108,7 +108,7 @@ jobs:
# DISPLAY: :0
# VITEST_SEGFAULT_RETRY: 4
# steps:
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
# - uses: ./.github/actions/firefoxTestsSetup
# with:
# gh-access-token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -123,7 +123,7 @@ jobs:
# yarn vitest:swap
# - name: Upload deps artifacts
# if: steps.FFE2eSwap.outcome == 'failure'
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: screenshots
# path: screenshots/
Expand All @@ -138,7 +138,7 @@ jobs:
# DISPLAY: :0
# VITEST_SEGFAULT_RETRY: 4
# steps:
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
# - uses: ./.github/actions/firefoxTestsSetup
# with:
# gh-access-token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -153,7 +153,7 @@ jobs:
# yarn vitest:send
# - name: Upload deps artifacts
# if: steps.FFE2eSend.outcome == 'failure'
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: screenshots
# path: screenshots/
Expand All @@ -168,7 +168,7 @@ jobs:
# DISPLAY: :0
# VITEST_SEGFAULT_RETRY: 4
# steps:
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
# - uses: ./.github/actions/firefoxTestsSetup
# with:
# gh-access-token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -183,7 +183,7 @@ jobs:
# yarn vitest:dappInteractions
# - name: Upload deps artifacts
# if: steps.FFE2eDappInteractions.outcome == 'failure'
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: screenshots
# path: screenshots/
Expand All @@ -192,14 +192,14 @@ jobs:
# run: exit 1
# CHROME TESTS
chrome-e2e-parallel:
runs-on: ubuntu-latest
runs-on: beefy-runner-bx
timeout-minutes: 18
needs: [build]
env:
DISPLAY: :0
VITEST_SEGFAULT_RETRY: 4
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/chromeTestsSetup
with:
gh-access-token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -213,7 +213,7 @@ jobs:
yarn vitest:parallel
- name: Upload deps artifacts
if: steps.ChromeE2EParallel.outcome == 'failure'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: screenshots
path: screenshots/
Expand All @@ -228,7 +228,7 @@ jobs:
DISPLAY: :0
VITEST_SEGFAULT_RETRY: 3
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/chromeTestsSetup
with:
gh-access-token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -242,7 +242,7 @@ jobs:
yarn vitest:swap
- name: Upload deps artifacts
if: steps.ChromeE2ESwaps.outcome == 'failure'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: screenshots
path: screenshots/
Expand All @@ -257,7 +257,7 @@ jobs:
DISPLAY: :0
VITEST_SEGFAULT_RETRY: 3
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/chromeTestsSetup
with:
gh-access-token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -271,7 +271,7 @@ jobs:
yarn vitest:send
- name: Upload deps artifacts
if: steps.ChromeE2ESend.outcome == 'failure'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: screenshots
path: screenshots/
Expand All @@ -286,7 +286,7 @@ jobs:
DISPLAY: :0
VITEST_SEGFAULT_RETRY: 3
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/chromeTestsSetup
with:
gh-access-token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -300,7 +300,7 @@ jobs:
yarn vitest:send:optimism
- name: Upload deps artifacts
if: steps.ChromeOpE2ESend.outcome == 'failure'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: screenshots
path: screenshots/
Expand All @@ -315,7 +315,7 @@ jobs:
DISPLAY: :0
VITEST_SEGFAULT_RETRY: 3
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/chromeTestsSetup
with:
gh-access-token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -329,7 +329,7 @@ jobs:
yarn vitest:dappInteractions
- name: Upload deps artifacts
if: steps.ChromeE2EDappInteractions.outcome == 'failure'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: screenshots
path: screenshots/
Expand All @@ -345,18 +345,18 @@ jobs:
# DISPLAY: :0
# VITEST_SEGFAULT_RETRY: 3
# steps:
# - uses: actions/checkout@v3
# - uses: actions/setup-node@v3
# - uses: actions/checkout@v4
# - uses: actions/setup-node@v4
# with:
# node-version: "18.18.0"
# node-version: "20.16.0"
# - name: Download deps cache artifacts
# uses: actions/download-artifact@v3
# uses: actions/download-artifact@v4
# with:
# name: node_modules.tar.gz
# - name: Unzip node_modules
# run: tar xzvf node_modules.tar.gz
# - name: Download build artifacts
# uses: actions/download-artifact@v3
# uses: actions/download-artifact@v4
# with:
# name: rainbowbx-${{ github.sha }}
# path: build
Expand All @@ -376,7 +376,7 @@ jobs:
# uses: foundry-rs/foundry-toolchain@v1
# with:
# version: nightly
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
# with:
# repository: 'rainbow-me/browser-extension-env'
# token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -394,30 +394,28 @@ jobs:
runs-on: ubuntu-latest
needs: [install]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18.18.0"
node-version: "20.16.0"
- name: Download deps cache artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: node_modules.tar.gz
- name: Unzip node_modules
run: tar xzf node_modules.tar.gz
- name: Install rust
uses: actions-rs/toolchain@v1
uses: moonrepo/setup-rust@v1.2.1
with:
toolchain: stable
target: wasm32-unknown-unknown
channel: stable
profile: minimal
override: true
- name: Fetch networks
run: yarn fetch:networks
- name: Install Anvil
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: 'rainbow-me/browser-extension-env'
token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -435,12 +433,12 @@ jobs:
runs-on: ubuntu-latest
needs: [install]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18.18.0"
node-version: "20.16.0"
- name: Download deps cache artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: node_modules.tar.gz
- name: Unzip node_modules
Expand All @@ -459,9 +457,9 @@ jobs:
runs-on: ubuntu-latest
needs: [chrome-e2e-parallel, chrome-e2e-swap, chrome-e2e-send, chrome-e2e-dappInteractions, chrome-optimism-e2e-send, unit-tests, ci-checks]
steps:
- uses: geekyeggo/delete-artifact@v2
- uses: geekyeggo/delete-artifact@v5
with:
name: node_modules.tar.gz
- uses: geekyeggo/delete-artifact@v2
- uses: geekyeggo/delete-artifact@v5
with:
name: screenshots
10 changes: 5 additions & 5 deletions .github/workflows/publish-internal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
Expand All @@ -24,13 +24,13 @@ jobs:
echo "No new commits. Canceling publish..."
exit 1
fi
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
with:
node-version: "18.18.0"
node-version: "20.16.0"
cache: 'yarn'
- name: Install deps via Yarn
run: yarn setup
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: 'rainbow-me/browser-extension-env'
token: ${{ secrets.DOTENV_GITHUB_ACCESS_TOKEN }}
Expand All @@ -50,7 +50,7 @@ jobs:
- name: Zip it
run: yarn zip
- name: Archive the build artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rainbowbx-v${{ env.release_version }}
path: build/
Expand Down
Loading

0 comments on commit 7a8a9aa

Please sign in to comment.