From 99c8fc124169a6ea3a694aca70ebfae0c96420cc Mon Sep 17 00:00:00 2001 From: Mati Dastugue Date: Tue, 21 Jul 2020 01:39:58 -0300 Subject: [PATCH 1/4] Allow desktop build on master --- .github/workflows/release.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84954364..8affc2d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,9 +3,8 @@ name: Build/Release Desktop app # this will help you specify where to run on: push: - branches-ignore: - # Temporary disable action - - '**' + branches: + - master env: REACT_APP_BLOCKNATIVE_KEY: ${{ secrets.REACT_APP_BLOCKNATIVE_KEY }} @@ -89,4 +88,3 @@ jobs: with: name: Desktop Windows path: ./dist/Safe[ ]Multisig*.exe - From 70720d4be139f41bac6a8b5e0b6785e5aed9f53e Mon Sep 17 00:00:00 2001 From: Mikhail Mikheev Date: Tue, 21 Jul 2020 15:20:08 +0400 Subject: [PATCH 2/4] Add github action for ESLint (#1125) * add github lint action * use yaml instructions from action repo * fix source root var * fix source root var * remove source root var * install libusb * use forked action * remove libusb setup from action vm * use new version of lint action * Fix version tag of action * update workflow file * update workflow file --- .github/workflows/lint.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/lint.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 00000000..fec199e5 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,14 @@ +name: Lint +on: pull_request + +jobs: + eslint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: gnosis/safe-react-eslint-action@main + # GITHUB_TOKEN in forked repositories is read-only + # https://help.github.com/en/actions/reference/events-that-trigger-workflows#pull-request-event-pull_request + if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }} + with: + repo-token: ${{secrets.GITHUB_TOKEN}} From 4f1eae8209375e311a718fb06284fe18ddaff3cb Mon Sep 17 00:00:00 2001 From: Mikhail Mikheev Date: Tue, 21 Jul 2020 15:57:56 +0400 Subject: [PATCH 3/4] CI: Use a different ESLint action (#1130) * use a different eslint action * workfile update --- .github/workflows/lint.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fec199e5..fc396a7c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,14 +1,9 @@ -name: Lint -on: pull_request +name: 'ESLint check' +on: [pull_request] jobs: eslint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: gnosis/safe-react-eslint-action@main - # GITHUB_TOKEN in forked repositories is read-only - # https://help.github.com/en/actions/reference/events-that-trigger-workflows#pull-request-event-pull_request - if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }} - with: - repo-token: ${{secrets.GITHUB_TOKEN}} + - uses: gnosis/safe-react-eslint-plus-action@main From 240b2068efbba05e4a8a075c8a3aab301d96e0fa Mon Sep 17 00:00:00 2001 From: nicolas Date: Tue, 21 Jul 2020 10:33:13 -0300 Subject: [PATCH 4/4] replace links and legal text (#1132) --- src/components/CookiesBanner/index.tsx | 2 +- src/components/Footer/index.tsx | 10 +++++----- src/routes/load/components/DetailsForm/index.tsx | 9 ++++----- src/routes/open/components/SafeNameForm/index.tsx | 9 ++++----- src/routes/welcome/components/Layout.tsx | 2 +- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/components/CookiesBanner/index.tsx b/src/components/CookiesBanner/index.tsx index 054e9727..6850456b 100644 --- a/src/components/CookiesBanner/index.tsx +++ b/src/components/CookiesBanner/index.tsx @@ -151,7 +151,7 @@ const CookiesBanner = () => {

We use cookies to give you the best experience and to help improve our website. Please read our{' '} - + Cookie Policy {' '} for more information. By clicking "Accept all", you agree to the storing of cookies on your device diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx index 3f63cb8a..4c82da45 100644 --- a/src/components/Footer/index.tsx +++ b/src/components/Footer/index.tsx @@ -57,23 +57,23 @@ const Footer = () => {