Merge branch 'electra' into pinebit/deposit-larger-than-32eth

ObolNetwork · Jan 16, 2025 · 0b6f269 · 0b6f269
2 parents eac6568 + 8a7a42e
commit 0b6f269
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/label-pr.yml b/.github/workflows/label-pr.yml
@@ -22,6 +22,9 @@ jobs:
           if [[ $GIT_BRANCH = main ]]; then
             # Do not label main branch PRs
             LABEL="skip"
+          elif [[ $GIT_BRANCH = electra ]]; then
+            # Label electra branch PRs
+            LABEL="electra"
           elif [[ $GIT_BRANCH = main* ]]; then
             # Label release branches
             LABEL="branch-release"

diff --git a/.github/workflows/nightly-tests.yml b/.github/workflows/nightly-tests.yml
@@ -43,7 +43,7 @@ jobs:
           echo "CHARON_REPO=$(pwd)" >> $GITHUB_ENV
           echo "DOCKER_BUILDKIT=1" >> $GITHUB_ENV
       - run: go test -race github.com/obolnetwork/charon/testutil/compose/fuzz -v -fuzzer -sudo-perms -timeout=45m -log-dir=.
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: fuzz-test-logs

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -70,7 +70,7 @@ jobs:
           echo "CHARON_REPO=$(pwd)" >> $GITHUB_ENV
           echo "DOCKER_BUILDKIT=1" >> $GITHUB_ENV
       - run: go test -race github.com/obolnetwork/charon/testutil/compose/smoke -v -integration -sudo-perms -timeout=20m -log-dir=.
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: smoke-test-logs