Merge branch 'master' into force-epoch-change-chain-simulator-master

multiversx · Nov 7, 2024 · bb2098a · bb2098a
2 parents f3910c7 + b531c6c
commit bb2098a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     strategy:
       matrix:
-        runs-on: [ubuntu-latest, macos-13, macos-13-xlarge]
+        runs-on: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.runs-on }}
     name: Build
     steps:

diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
@@ -15,7 +15,7 @@ jobs:
   build:
     strategy:
       matrix:
-        runs-on: [ubuntu-latest, macos-13, macos-13-xlarge]
+        runs-on: [ubuntu-latest]
     runs-on: ${{ matrix.runs-on }}
     name: Build
     steps:
@@ -129,7 +129,7 @@ jobs:
           zip -r -j ${ARCHIVE} ${BUILD_DIR}
 
       - name: Save artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARCHIVE }}
           path: ${{ env.ARCHIVE }}
@@ -145,7 +145,7 @@ jobs:
         # https://docs.github.com/en/free-pro-team@latest/actions/guides/storing-workflow-data-as-artifacts#downloading-or-deleting-artifacts
         # A directory for each artifact is created using its name
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: assets
 

diff --git a/.github/workflows/docker-keygenerator.yaml b/.github/workflows/docker-keygenerator.yaml
@@ -2,7 +2,6 @@ name: Build & push keygenerator docker image
 
 on:
   workflow_dispatch:
-  pull_request:
 
 jobs:
   build-docker-image:
@@ -19,7 +18,6 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Log into Docker Hub
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -32,5 +30,5 @@ jobs:
           context: .
           file: ./docker/keygenerator/Dockerfile
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           tags: multiversx/chain-keygenerator:latest
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -5,6 +5,7 @@ on:
       - master
   pull_request:
     branches: [ master, feat/*, rc/* ]
+  workflow_dispatch:
 
 permissions:
   contents: read