From d9883f4c48e0b6ac1f7a3d99a87c8836a3b32918 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 16:12:43 -0300 Subject: [PATCH 01/18] Fix: Update Auth method for dependencies Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fbe7307..0241c17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,9 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Auth deps + run: gh auth login --with-token < ${{ secrets.GH_TOKEN }} + - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 with: From 5701621108e7b4fbbd8fc6c074273b8463d9a9e8 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 16:16:07 -0300 Subject: [PATCH 02/18] Fix syntax --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0241c17..a0caff4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: Auth deps - run: gh auth login --with-token < ${{ secrets.GH_TOKEN }} + run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 From 1551c51b5286535092792087f96dc84a5513b124 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 16:23:48 -0300 Subject: [PATCH 03/18] check users Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0caff4..efdb889 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: Auth deps - run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token + run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token && git config user.name && git config user.email - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 From 949c33d20a617ed128c0f5de1a34551e1d42ff44 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 16:25:18 -0300 Subject: [PATCH 04/18] check data Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index efdb889..b8036f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,10 @@ jobs: - uses: actions/checkout@v2 - name: Auth deps - run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token && git config user.name && git config user.email + run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token + + -name: Check users + run: git config user.name && git config user.email - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 From fb5ab9df788f3f3128f52d24c390d393db579262 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 16:25:55 -0300 Subject: [PATCH 05/18] fix lint Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8036f7..5fd7937 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - name: Auth deps run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token - -name: Check users + - name: Check users run: git config user.name && git config user.email - name: Install Foundry From 2ca78e92f9505653246d777a9dcb045245ba3a60 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 16:28:10 -0300 Subject: [PATCH 06/18] updategh Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5fd7937..1f844a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token - name: Check users - run: git config user.name && git config user.email + run: gh config get user.name && gh config get user.email - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 From 58fcff95d78f45352946ab5b95cccdcaef25e565 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 16:31:38 -0300 Subject: [PATCH 07/18] Update data Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f844a7..d1e181a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token - name: Check users - run: gh config get user.name && gh config get user.email + run: gh api user | jq -r '.login' && gh api user | jq -r '.email' - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 From ee7fd986c58e4d9bbaf2f99164365b3e9d26ba6b Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 16:33:38 -0300 Subject: [PATCH 08/18] check clone Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1e181a..9e9b798 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,10 @@ jobs: run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token - name: Check users - run: gh api user | jq -r '.login' && gh api user | jq -r '.email' + run: gh api user | jq -r '.login' + + - name: Get repo + run: git clone https://github.com/UMAprotocol/oev-contracts.git - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 From d3cdf4e2502e3025fea934f4f5a94b693550a349 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 16:45:13 -0300 Subject: [PATCH 09/18] Check git configs Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e9b798..065172f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,6 +20,15 @@ jobs: - name: Check users run: gh api user | jq -r '.login' + - name: store credentials + run: | + echo "Starting git login configs..." + touch ${{ secrets.CREDENTIAL_PATH }} + echo "https://${{ secrets.USER }}:${{ secrets.GH_TOKEN }}@github.com" > ${{ secrets.CREDENTIAL_PATH }} + git config --global credential.helper 'store --file ${{ secrets.CREDENTIAL_PATH }}' + git config --global credential.helper 'cache --timeout=3600' + git config --global user.name ${{ secrets.USER }} + - name: Get repo run: git clone https://github.com/UMAprotocol/oev-contracts.git From 498d06293be150ab07c7307fcb1ccbd9822d4712 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 16:53:29 -0300 Subject: [PATCH 10/18] update git Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 065172f..03c526c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,7 @@ jobs: echo "https://${{ secrets.USER }}:${{ secrets.GH_TOKEN }}@github.com" > ${{ secrets.CREDENTIAL_PATH }} git config --global credential.helper 'store --file ${{ secrets.CREDENTIAL_PATH }}' git config --global credential.helper 'cache --timeout=3600' + git config --global user.email ${{ secrets.EMAIL }} git config --global user.name ${{ secrets.USER }} - name: Get repo From fec1c15ee173c5365790a5b054ffe6f6f96b8ca8 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 17:01:47 -0300 Subject: [PATCH 11/18] test clone-s --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03c526c..6a41096 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: git config --global user.name ${{ secrets.USER }} - name: Get repo - run: git clone https://github.com/UMAprotocol/oev-contracts.git + run: git clone https://${{ secrets.GH_TOKEN }}@github.com/UMAprotocol/oev-contracts.git - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 From 57dbd99b696737a57090e2b93b6e5f75f6600f84 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 17:03:52 -0300 Subject: [PATCH 12/18] test modules-s --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index b83ed6d..3a74959 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/foundry-rs/forge-std.git [submodule "lib/oev-contracts"] path = lib/oev-contracts - url = https://github.com/UMAprotocol/oev-contracts.git + url = https://${{ secrets.GH_TOKEN }}github.com/UMAprotocol/oev-contracts.git [submodule "lib/openzeppelin-contracts"] path = lib/openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts From d462e7c5945e427f489aedb034dba309bc5e7d30 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 17:05:04 -0300 Subject: [PATCH 13/18] fix lint Signed-off-by: Evaldo Felipe --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 3a74959..c4dd385 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/foundry-rs/forge-std.git [submodule "lib/oev-contracts"] path = lib/oev-contracts - url = https://${{ secrets.GH_TOKEN }}github.com/UMAprotocol/oev-contracts.git + url = https://${{ secrets.GH_TOKEN }}@github.com/UMAprotocol/oev-contracts.git [submodule "lib/openzeppelin-contracts"] path = lib/openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts From c009d75da4ed5692457eb974d8530846674bc7fd Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 17:12:17 -0300 Subject: [PATCH 14/18] update submodules Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 3 +++ .gitmodules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a41096..9ef4e92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + token: ${{ secrets.GH_TOKEN }} + submodules: recursive - name: Auth deps run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token diff --git a/.gitmodules b/.gitmodules index c4dd385..b83ed6d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/foundry-rs/forge-std.git [submodule "lib/oev-contracts"] path = lib/oev-contracts - url = https://${{ secrets.GH_TOKEN }}@github.com/UMAprotocol/oev-contracts.git + url = https://github.com/UMAprotocol/oev-contracts.git [submodule "lib/openzeppelin-contracts"] path = lib/openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts From f7e50fea6af3f930f42b91aa2618a02cdeda84c5 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 17:13:28 -0300 Subject: [PATCH 15/18] fix lint Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ef4e92..c5fb262 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,8 @@ jobs: run-ci: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v2 with: token: ${{ secrets.GH_TOKEN }} submodules: recursive From 778415559a6e52bae3ece07d92fd864cbb3e3037 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 17:15:05 -0300 Subject: [PATCH 16/18] fix lint Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5fb262..669138d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,11 +12,13 @@ jobs: run-ci: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 + - name: Checkout - uses: actions/checkout@v2 - with: - token: ${{ secrets.GH_TOKEN }} - submodules: recursive + uses: actions/checkout@v2 + with: + token: ${{ secrets.GH_TOKEN }} + submodules: recursive - name: Auth deps run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token From f2d16b015de8482ca430e33b543146130a16ab6c Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 17:18:46 -0300 Subject: [PATCH 17/18] update ci Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 669138d..8d72c23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,25 +20,6 @@ jobs: token: ${{ secrets.GH_TOKEN }} submodules: recursive - - name: Auth deps - run: echo ${{ secrets.GH_TOKEN }} | gh auth login --with-token - - - name: Check users - run: gh api user | jq -r '.login' - - - name: store credentials - run: | - echo "Starting git login configs..." - touch ${{ secrets.CREDENTIAL_PATH }} - echo "https://${{ secrets.USER }}:${{ secrets.GH_TOKEN }}@github.com" > ${{ secrets.CREDENTIAL_PATH }} - git config --global credential.helper 'store --file ${{ secrets.CREDENTIAL_PATH }}' - git config --global credential.helper 'cache --timeout=3600' - git config --global user.email ${{ secrets.EMAIL }} - git config --global user.name ${{ secrets.USER }} - - - name: Get repo - run: git clone https://${{ secrets.GH_TOKEN }}@github.com/UMAprotocol/oev-contracts.git - - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 with: From a07ada61cda6c03c8751ff63bfa75a670feb4079 Mon Sep 17 00:00:00 2001 From: Evaldo Felipe Date: Thu, 26 Oct 2023 17:23:41 -0300 Subject: [PATCH 18/18] Update actions submodules auth Signed-off-by: Evaldo Felipe --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d72c23..69ba3ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Checkout + - name: Checkout modules uses: actions/checkout@v2 with: token: ${{ secrets.GH_TOKEN }}