Merge branch 'develop' into feat/e2e-tests

lidofinance · Nov 27, 2023 · 6b1d023 · 6b1d023
2 parents 939e23f + d5a4d67
commit 6b1d023
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 14 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -0,0 +1,14 @@
+name: Tests and Checks
+
+on: push
+
+jobs:
+  security:
+    uses: lidofinance/linters/.github/workflows/security.yml@master
+    permissions:
+      security-events: write
+      contents: read
+  docker:
+    uses: lidofinance/linters/.github/workflows/docker.yml@master
+  actions:
+    uses: lidofinance/linters/.github/workflows/actions.yml@master
diff --git a/.github/workflows/ci-dev-goerli.yml b/.github/workflows/ci-dev-goerli.yml
@@ -0,0 +1,29 @@
+name: CI Dev Goerli
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - goerli
+    paths-ignore:
+      - ".github/**"
+
+permissions: {}
+
+jobs:
+  # test:
+  #   ...
+
+  deploy:
+    runs-on: ubuntu-latest
+    # needs: test
+    name: Build and deploy
+    steps:
+      - name: Testnet deploy
+        uses: lidofinance/dispatch-workflow@v1
+        env:
+          APP_ID: ${{ secrets.APP_ID }}
+          APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+          TARGET_REPO: "lidofinance/infra-mainnet"
+          TARGET_WORKFLOW: "deploy_testnet_depositor_bot_staking_router.yaml"
+          TARGET: "goerli"
diff --git a/.github/workflows/ci-dev.yml b/.github/workflows/ci-dev.yml
@@ -1,4 +1,4 @@
-name: CI Dev
+name: CI Dev Holesky
 
 on:
   workflow_dispatch:
@@ -25,5 +25,5 @@ jobs:
           APP_ID: ${{ secrets.APP_ID }}
           APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
           TARGET_REPO: "lidofinance/infra-mainnet"
-          TARGET_WORKFLOW: "deploy_testnet_depositor_bot_staking_router.yaml"
+          TARGET_WORKFLOW: "deploy_holesky_testnet_depositor_bot_staking_router.yaml"
           TARGET: "develop"
diff --git a/.github/workflows/tests_and_checks.yml b/.github/workflows/tests_and_checks.yml
@@ -47,18 +47,7 @@ jobs:
         run: |
           poetry run pytest tests -m integration
         env:
+
           WEB3_RPC_ENDPOINTS: ${{ secrets.WEB3_RPC_ENDPOINT }}
           DEPOSIT_CONTRACT: "0x00000000219ab540356cBB839Cbe05303d7705Fa"
           LIDO_LOCATOR: "0xC1d0b3DE6792Bf6b4b37EccdcC24e45978Cfd2Eb"
-
-  security:
-    uses: lidofinance/linters/.github/workflows/security.yml@master
-    permissions:
-      security-events: write
-      contents: read
-
-  docker:
-    uses: lidofinance/linters/.github/workflows/docker.yml@master
-
-  actions:
-    uses: lidofinance/linters/.github/workflows/actions.yml@master