Skip to content

Commit 6671aa7

Browse files
authored
Merge pull request #6380 from multiversx/merge_master_into_rc17next1_2024.08.08
Merge master into rc17next1 2024.08.08
2 parents ecb7bdc + f894d55 commit 6671aa7

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build:
1010
strategy:
1111
matrix:
12-
runs-on: [ubuntu-latest, macos-13-xlarge]
12+
runs-on: [ubuntu-latest, macos-13, macos-13-xlarge]
1313
runs-on: ${{ matrix.runs-on }}
1414
name: Build
1515
steps:

.github/workflows/create_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
build:
1616
strategy:
1717
matrix:
18-
runs-on: [ubuntu-latest, macos-13-xlarge]
18+
runs-on: [ubuntu-latest, macos-13, macos-13-xlarge]
1919
runs-on: ${{ matrix.runs-on }}
2020
name: Build
2121
steps:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/multiversx/mx-chain-scenario-go v1.4.4
2323
github.com/multiversx/mx-chain-storage-go v1.0.16
2424
github.com/multiversx/mx-chain-vm-common-go v1.5.13
25-
github.com/multiversx/mx-chain-vm-go v1.5.31
25+
github.com/multiversx/mx-chain-vm-go v1.5.32-0.20240808073353-f1fbbf147537
2626
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.68
2727
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.69
2828
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.98

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ github.com/multiversx/mx-chain-storage-go v1.0.16 h1:l2lJq+EAN3YwLbjJrnoKfFd1/1X
401401
github.com/multiversx/mx-chain-storage-go v1.0.16/go.mod h1:uM/z7YyqTOD3wgyH8TfapyEl5sb+7x/Jaxne4cfG4HI=
402402
github.com/multiversx/mx-chain-vm-common-go v1.5.13 h1:ymnIHJW4Z4mFa0hZzla4fozkF30vjH5O1q+Y7Ftc+pQ=
403403
github.com/multiversx/mx-chain-vm-common-go v1.5.13/go.mod h1:OSvFbzdWThfRbLZbUsEr7bikBSaLrPJQ2iUm9jw9nXQ=
404-
github.com/multiversx/mx-chain-vm-go v1.5.31 h1:ywyqbVE94bhbO3LvcP/28pWoSR0NfEXLJNe+q1cgQ78=
405-
github.com/multiversx/mx-chain-vm-go v1.5.31/go.mod h1:iq6sCPweoHC9Fx56uf8buPrqlGVGJKUMRFxTunzjvys=
404+
github.com/multiversx/mx-chain-vm-go v1.5.32-0.20240808073353-f1fbbf147537 h1:x1Fn0tlkicBNsRB/co/c9TTjyvCrzmE/rVXA8uUWhII=
405+
github.com/multiversx/mx-chain-vm-go v1.5.32-0.20240808073353-f1fbbf147537/go.mod h1:iq6sCPweoHC9Fx56uf8buPrqlGVGJKUMRFxTunzjvys=
406406
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.68 h1:L3GoAVFtLLzr9ya0rVv1YdTUzS3MyM7kQNBSAjCNO2g=
407407
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.68/go.mod h1:ixxwib+1pXwSDHG5Wa34v0SRScF+BwFzH4wFWY31saI=
408408
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.69 h1:G/PLsyfQV4bMLs2amGRvaLKZoW1DC7M+7ecVaLuaCNc=

0 commit comments

Comments
 (0)