Skip to content

Commit

Permalink
chore: update CLA action to use unified repo (#648)
Browse files Browse the repository at this point in the history
* chore: update README badget and set Safe Bot the bot flag

* chore: remove Gnosis references

* chore: update mock links
  • Loading branch information
dasanra authored Jan 26, 2023
1 parent 106dac7 commit 8365657
Show file tree
Hide file tree
Showing 13 changed files with 57 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/actions/release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ runs:
steps:
- name: Setup git user to "🦉🤖 Safe Bot"
shell: bash
run: git config user.email "-" && git config user.name "🦉🤖 Safe Bot"
run: git config user.email "-" && git config user.name "🦉🤖 Safe Bot[bot]"

# Script to upload release files and notify production deployments
- name: 'Upload build files to S3 and call the hook to notify '
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ runs:
using: 'composite'
steps:
- name: Node.js setup
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ inputs.node-version }}
cache: 'yarn'
Expand All @@ -33,7 +33,7 @@ runs:
sudo apt-get update
sudo apt-get -y install python3-pip python3-dev
pip install awscli --upgrade --user
- name: Project dependencies setup, node version ${{ matrix.node-version }}
- name: Project dependencies setup, node version ${{ inputs.node-version }}
shell: bash
run: yarn install --frozen-lockfile

Expand Down
31 changes: 22 additions & 9 deletions .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,29 @@ jobs:
steps:
- name: 'CLA Assistant'
if: (github.event.comment.body == 'recheckcla' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
# Alpha Release
uses: gnosis/cla-github-action@master
# GitHub token, automatically provided to the action
# (No need to define this secret in the repo settings)
# Beta Release
uses: contributor-assistant/github-action@v2.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# the below token should have repo scope and must be manually added by you in the repository's secret
PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ACCESS_TOKEN }}
with:
path-to-signatures: 'signatures/version1/cla.json'
path-to-cla-document: 'https://safe.global/cla/'
branch: 'cla-signatures'
allowlist: lukasschor,mikhailxyz,rmeissner,germartinez,gabitoesmiapodo,davidalbela,Uxio0,dasanra,francovenica,tschubotz,luarx,giacomolicari,gnosis-info,bot*,DaniSomoza,yagopv,JagoFigueroa
empty-commit-flag: false
blockchain-storage-flag: false
path-to-document: 'https://safe.global/cla/' # e.g. a CLA or a DCO document
# branch should not be protected
branch: 'main'
# user names of users allowed to contribute without CLA
allowlist: mikhailxyz,rmeissner,germartinez,Uxio0,dasanra,francovenica,luarx,DaniSomoza,yagopv,JagoFigueroa,bot*

# the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
# enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)
remote-organization-name: 'safe-global'
# enter the remote repository name where the signatures should be stored (Default is storing the signatures in the same repository)
remote-repository-name: 'cla-signatures'
#create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
#signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo'
#custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
#custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
#custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
#lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
#use-dco-flag: true - If you are using DCO instead of CLA
6 changes: 3 additions & 3 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.ref }}
fetch-depth: 0
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
if: github.event_name != 'pull_request' && github.event_name != 'workflow_dispatch'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0

Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
ref: main
Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,15 @@ jobs:
eslint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: gnosis/safe-react-eslint-plus-action@main
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: 18
cache: yarn

- name: Install Dependencies
run: yarn install --frozen-lockfile

- name: Run eslint
run: yarn lint:check
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Safe Apps

[![Logo](https://raw.githubusercontent.com/safe-global/safe-react-apps/main/assets/logo.png)](https://gnosis-safe.io/)
[![Logo](https://raw.githubusercontent.com/safe-global/safe-react-apps/main/assets/logo.png)](https://safe.global/)

![license](https://img.shields.io/github/license/safe-global/safe-react-apps)
![build](https://img.shields.io/github/workflow/status/safe-global/safe-react-apps/Deploy%20safe%20apps/main)
![tests](https://img.shields.io/github/workflow/status/safe-global/safe-react-apps/Test/main?label=tests)
![build](https://img.shields.io/github/actions/workflow/status/safe-global/safe-react-apps/deployment.yml?branch=main)
![tests](https://img.shields.io/github/actions/workflow/status/safe-global/safe-react-apps/safe-apps-e2e.yml?branch=main)

This project contains apps developed by Gnosis to be consumed by Gnosis Safe.
This project contains apps developed by Gnosis to be consumed by the Safe.

## Install

Expand Down Expand Up @@ -42,7 +42,7 @@ yarn start:wallet-connect

## Contracts

This project contains some test contracts to check all solidity types in the tx-builder Safe App.
This project contains some test contracts to check all solidity types in the `tx-builder` Safe App.

You can deploy your own tests contracts using the following command:

Expand Down
2 changes: 1 addition & 1 deletion apps/drain-safe/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="A Gnosis Safe app to transfer all assets in a batch" />
<meta name="description" content="A Safe App to transfer all assets in a batch" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
Expand Down
2 changes: 1 addition & 1 deletion apps/drain-safe/src/__tests__/sdk-helpers.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('Safe SDK helpers', () => {
symbol: 'DAI',
name: 'Dai',
logoUri:
'https://gnosis-safe-token-logos.s3.amazonaws.com/0x5592EC0cfb4dbc12D3aB100b257153436a1f0FEa.png',
'https://safe-transaction-assets.staging.5afe.dev/0x5592EC0cfb4dbc12D3aB100b257153436a1f0FEa.png',
},
tokenInfo: {
type: 'ERC20',
Expand Down
8 changes: 4 additions & 4 deletions apps/drain-safe/src/utils/test-helpers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const mockInitialBalances = [
symbol: 'LINK',
name: 'ChainLink Token',
logoUri:
'https://gnosis-safe-token-logos.s3.amazonaws.com/0x01BE23585060835E02B77ef475b0Cc51aA1e0709.png',
'https://safe-transaction-assets.staging.5afe.dev/0x01BE23585060835E02B77ef475b0Cc51aA1e0709.png',
},
balance: '10000000000000000000',
fiatBalance: '32.17898',
Expand All @@ -111,7 +111,7 @@ export const mockInitialBalances = [
symbol: 'DAI',
name: 'Dai Stablecoin',
logoUri:
'https://gnosis-safe-token-logos.s3.amazonaws.com/0xc7AD46e0b8a400Bb3C915120d284AafbA8fc4735.png',
'https://safe-transaction-assets.staging.5afe.dev/0xc7AD46e0b8a400Bb3C915120d284AafbA8fc4735.png',
},
balance: '342342323423000000000000000000',
fiatBalance: '24.89904',
Expand All @@ -125,7 +125,7 @@ export const mockInitialBalances = [
symbol: 'MKR',
name: 'Maker',
logoUri:
'https://gnosis-safe-token-logos.s3.amazonaws.com/0xF9bA5210F91D0474bd1e1DcDAeC4C58E359AaD85.png',
'https://safe-transaction-assets.staging.5afe.dev/0xF9bA5210F91D0474bd1e1DcDAeC4C58E359AaD85.png',
},
balance: '318438539290761',
fiatBalance: '0.00000',
Expand All @@ -139,7 +139,7 @@ export const mockInitialBalances = [
symbol: 'UNI',
name: 'Uniswap',
logoUri:
'https://gnosis-safe-token-logos.s3.amazonaws.com/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984.png',
'https://safe-transaction-assets.staging.5afe.dev/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984.png',
},
balance: '1050000000000000044',
fiatBalance: '3971.92584',
Expand Down
4 changes: 2 additions & 2 deletions apps/ramp-network/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Then:
- If HTTPS is used (by default enabled)
- Open your Safe app locally (by default via https://localhost:3000/) and accept the SSL error.
- Go to Safe Multisig web interface
- [Mainnet](https://app.gnosis-safe.io)
- [Rinkeby](https://rinkeby.gnosis-safe.io/app)
- [Mainnet](https://app.safe.global/?chain=eth)
- [Goerli](https://app.safe.global/?chain=gor)
- Create your test safe
- Go to Apps -> Manage Apps -> Add Custom App
- Paste your localhost URL, default is https://localhost:3000/
Expand Down
2 changes: 1 addition & 1 deletion apps/ramp-network/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>Gnosis Safe App</title>
<title>Ramp Network Safe App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet-connect/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Allows your Gnosis Safe Multisig to connect to dapps via WalletConnect."
content="Allows your Safe to connect to dapps via WalletConnect."
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/favicon.ico" />
<!--
Expand All @@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>Gnosis Safe Multisig</title>
<title>WalletConnect Safe App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
2 changes: 1 addition & 1 deletion apps/wallet-connect/public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "WalletConnect",
"description": "Allows your Gnosis Safe Multisig to connect to dapps via WalletConnect.",
"description": "Allows your Safe to connect to dapps via WalletConnect.",
"iconPath": "wallet-connect.svg",
"icons": [
{
Expand Down

0 comments on commit 8365657

Please sign in to comment.