Skip to content

Commit ad768b1

Browse files
authored
Merge pull request #144 from multiversx/MX-16890-merge-barnard-sovereign
Merge barnard to sovereign
2 parents 3093ff6 + c094f6f commit ad768b1

File tree

101 files changed

+440
-2227
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+440
-2227
lines changed

.github/workflows/deploy-docker.yml

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go 1.x
2323
uses: actions/setup-go@v5
2424
with:
25-
go-version: 1.20.7
25+
go-version: 1.23.6
2626
id: go
2727

2828
- name: Get dependencies
@@ -52,21 +52,45 @@ jobs:
5252
username: ${{ secrets.DOCKERHUB_USERNAME }}
5353
password: ${{ secrets.DOCKERHUB_TOKEN }}
5454

55-
- name: Extract metadata (tags, labels) for Docker
56-
id: meta
55+
- name: Extract metadata (tags, labels) for released releases
56+
if: ${{ github.event.release.prerelease == false }}
57+
id: meta_released
58+
uses: docker/metadata-action@v5
59+
with:
60+
images: multiversx/chainsimulator
61+
62+
- name: Extract metadata (tags, labels) for prereleased releases
63+
if: ${{ github.event.release.prerelease == true }}
64+
id: meta_prereleased
5765
uses: docker/metadata-action@v5
5866
with:
5967
images: multiversx/sovereign-chainsimulator
68+
tags: |
69+
type=raw,value=${{ github.event.release.tag_name }}
70+
labels: |
71+
type=raw,value=${{ github.event.release.name }}
6072
61-
- name: Build and push Docker image
62-
id: push
73+
- name: Build and push Docker image for released
74+
if: ${{ github.event.release.prerelease == false }}
75+
id: push_released
6376
uses: docker/build-push-action@v6
6477
with:
6578
context: .
6679
# We need to make sure that if we ever have to merge this branch in main, this needs to be changed
6780
file: ./Dockerfile
6881
platforms: linux/amd64,linux/arm64
6982
push: ${{ github.event_name != 'pull_request' }}
70-
tags: ${{ steps.meta.outputs.tags }}
71-
labels: ${{ steps.meta.outputs.labels }}
83+
tags: ${{ steps.meta_released.outputs.tags }}
84+
labels: ${{ steps.meta_released.outputs.labels }}
7285

86+
- name: Build and push Docker image for prereleased
87+
if: ${{ github.event.release.prerelease == true }}
88+
id: push_prereleased
89+
uses: docker/build-push-action@v6
90+
with:
91+
context: .
92+
file: ./Dockerfile
93+
platforms: linux/amd64,linux/arm64
94+
push: ${{ github.event_name == 'release' && github.event.action == 'published' }}
95+
tags: ${{ steps.meta_prereleased.outputs.tags }}
96+
labels: ${{ steps.meta_prereleased.outputs.labels }}

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go 1.x
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: 1.20.7
19+
go-version: 1.23.6
2020
cache: false
2121
id: go
2222

@@ -27,7 +27,7 @@ jobs:
2727
uses: golangci/golangci-lint-action@v3
2828
with:
2929
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
30-
version: v1.57.2
30+
version: v1.64.5
3131

3232
# Optional: working directory, useful for monorepos
3333
# working-directory: somedir

.github/workflows/pr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go 1.x
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.20.7
18+
go-version: 1.23.6
1919
id: go
2020

2121
- name: Checkout mx-chain-simulator-go

.github/workflows/pr-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ jobs:
1515
- name: Set up Go 1.x
1616
uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.20.7
18+
go-version: 1.23.6
1919
id: go
2020

2121
- name: Checkout mx-chain-simulator-go
2222
uses: actions/checkout@v4
23-
2423
- name: Unit tests
2524
run: |
2625
go test ./...

.github/workflows/run-examples.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
steps:
1515
- name: Checkout mx-chain-simulator-go
1616
uses: actions/checkout@v4
17-
1817
- name: Install dependencies
1918
run: |
2019
python3 -m pip install --upgrade pip

.github/workflows/run-multiple-instances.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set up Go 1.x
1515
uses: actions/setup-go@v5
1616
with:
17-
go-version: 1.20.7
17+
go-version: 1.23.6
1818
id: go
1919

2020
- name: Checkout mx-chain-simulator-go

.github/workflows/run-vm-query-after-start.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Go 1.x
1414
uses: actions/setup-go@v5
1515
with:
16-
go-version: 1.20.7
16+
go-version: 1.23.6
1717
id: go
1818

1919
- name: Checkout mx-chain-simulator-go

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20.7 AS builder
1+
FROM golang:1.23.6 AS builder
22

33

44
WORKDIR /multiversx

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ run-examples:
2424

2525
$(MAKE) docker-build
2626
docker run -d --name "${IMAGE_NAME}" -p 8085:8085 ${CHAIN_SIMULATOR_IMAGE_NAME}:${CHAIN_SIMULATOR_IMAGE_TAG} ${SIMULATOR_TYPE}
27-
cd scripts/run-examples && /bin/bash script.sh
27+
cd scripts/run-examples && /bin/bash install-python-deps.sh && /bin/bash script.sh
2828
docker stop "${IMAGE_NAME}"
2929
docker rm ${IMAGE_NAME}
3030

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ Using the `cmd/chainsimulator` package as root, execute the following commands:
430430
- install go dependencies: `go install`
431431
- build executable: `go build -o chainsimulator`
432432

433-
Note: go version 1.20.* should be used to build the executable. Using version 1.21.* leads to build failures currently.
433+
Note: go version 1.23.* should be used to build the executable.
434434

435435

436436
## Launching the chainsimulator

0 commit comments

Comments
 (0)