Merge branch 'main' into skylenet/docker-login-when-got-secrets

ethpandaops · Oct 31, 2024 · 84a2211 · 84a2211
2 parents a589b62 + 53578a6
commit 84a2211
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/.github/actions/kurtosis-install/action.yaml b/.github/actions/kurtosis-install/action.yaml
@@ -0,0 +1,21 @@
+name: Kurtosis install
+inputs:
+  version:
+    description: 'Version to install'
+    required: false
+    default: '1.3.1'
+runs:
+  using: composite
+  steps:
+    - name: Install
+      shell: bash
+      run: |
+        echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
+        sudo apt update
+        if [ "${{ inputs.version }}" = "latest" ]; then
+          sudo apt install kurtosis-cli
+        else
+          sudo apt install kurtosis-cli=${{ inputs.version }}
+        fi
+        kurtosis analytics disable
+        echo "$(dirname $(which kurtosis))" >> $GITHUB_PATH
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -31,11 +31,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Setup Kurtosis
-        run: |
-          echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
-          sudo apt update
-          sudo apt install kurtosis-cli
-          kurtosis analytics disable
+        uses: ./.github/actions/kurtosis-install
 
       - name: Run Starlark
         run: |
@@ -76,6 +72,7 @@ jobs:
       - name: Kurtosis Assertoor GitHub Action
         uses: ethpandaops/kurtosis-assertoor-github-action@v1
         with:
+          kurtosis_version: "1.3.1"
           kurtosis_extra_args: "--image-download always --non-blocking-tasks --verbosity DETAILED"
           ethereum_package_branch: ""
           ethereum_package_args: .github/tests/mix-assert.yaml

diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml
@@ -18,12 +18,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Setup Kurtosis
-        run: |
-          echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
-          sudo apt update
-          sudo apt install kurtosis-cli
-          kurtosis analytics disable
-
+        uses: ./.github/actions/kurtosis-install
       - name: Run Starlark
         run: |
           kurtosis run ${{ github.workspace }} --args-file network_params.yaml
@@ -50,12 +45,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Setup Kurtosis
-        run: |
-          echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
-          sudo apt update
-          sudo apt install kurtosis-cli
-          kurtosis analytics disable
-
+        uses: ./.github/actions/kurtosis-install
       - name: Run Starlark
         run: |
           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
@@ -67,12 +57,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Setup Kurtosis
-        run: |
-          echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
-          sudo apt update
-          sudo apt install kurtosis-cli
-          kurtosis analytics disable
-
+        uses: ./.github/actions/kurtosis-install
       - name: Kurtosis Lint
         run: kurtosis lint ${{ github.workspace }}
 
@@ -89,6 +74,7 @@ jobs:
       - name: Kurtosis Assertoor GitHub Action
         uses: ethpandaops/kurtosis-assertoor-github-action@v1
         with:
+          kurtosis_version: "1.3.1"
           ethereum_package_url: "."
           ethereum_package_branch: ""
           ethereum_package_args: .github/tests/mix-assert.yaml
diff --git a/.github/workflows/run-k8s.yml b/.github/workflows/run-k8s.yml
@@ -38,6 +38,7 @@ jobs:
         id: testnet
         uses: ethpandaops/kurtosis-assertoor-github-action@v1
         with:
+          kurtosis_version: "1.3.1"
           kurtosis_extra_args: "--image-download always --non-blocking-tasks --verbosity DETAILED"
           kurtosis_backend: "kubernetes"
           kubernetes_config: "${{ steps.kubeconfig.outputs.kubeconfig }}"