Skip to content

Commit bcd4265

Browse files
Built Macos binary for ARM, deleted AMD build (#452)
* Update CI runner to macos-14 * Updated actions/upload-artifact to v4 * Bump v3.0.2.rc2 * Fix ssl error in macos * Use xcode-select * brew install openssl * Restore brew install libpq * Add flags * Fix release.yaml * Upd actions/download-artifact * Del brew install openssl * Check python version and openssl version * More openssl logging * Fix logging * Fix 2 * Fix 3 * Move changes to release.yaml * Fix * Install openssl@3.0 * Update actions/setup-python to v5 * Cleanup * Bump v3.0.2 * Cleanup 2
1 parent dc2d8ff commit bcd4265

File tree

5 files changed

+24
-18
lines changed

5 files changed

+24
-18
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: actions/checkout@v4
1212

1313
- name: Set up python
14-
uses: actions/setup-python@v4
14+
uses: actions/setup-python@v5
1515
with:
1616
python-version: 3.12.8
1717

@@ -56,7 +56,7 @@ jobs:
5656
uses: actions/checkout@v4
5757

5858
- name: Set up python
59-
uses: actions/setup-python@v4
59+
uses: actions/setup-python@v5
6060
with:
6161
python-version: 3.12.8
6262

@@ -94,7 +94,7 @@ jobs:
9494
uses: actions/checkout@v4
9595

9696
- name: Set up python
97-
uses: actions/setup-python@v4
97+
uses: actions/setup-python@v5
9898
with:
9999
python-version: 3.12.8
100100

.github/workflows/release.yaml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@v4
1818

1919
- name: Set up python
20-
uses: actions/setup-python@v4
20+
uses: actions/setup-python@v5
2121
with:
2222
python-version: 3.12.8
2323

@@ -67,11 +67,11 @@ jobs:
6767
cp ${BUILD_FILE_NAME}.tar.gz /tmp/artifacts;
6868
sha256sum ${BUILD_FILE_NAME}.tar.gz | head -c 64 > /tmp/artifacts/${BUILD_FILE_NAME}.sha256;
6969
70-
- OS: macos-13
70+
- OS: macos-14
7171
PYTHON_VERSION: 3.12.8
7272
BUILD_CMD: |
7373
export PYTHONHASHSEED=42
74-
export BUILD_FILE_NAME=operator-${RELEASE_VERSION}-darwin-amd64;
74+
export BUILD_FILE_NAME=operator-${RELEASE_VERSION}-darwin-arm64;
7575
mkdir ${BUILD_FILE_NAME};
7676
git rev-parse --short HEAD > GIT_SHA
7777
poetry run pyinstaller \
@@ -112,9 +112,10 @@ jobs:
112112
run: |
113113
brew install libpq
114114
brew link --force libpq
115-
if: matrix.os == 'macos-13'
115+
brew install openssl@3.0
116+
if: matrix.os == 'macos-14'
116117

117-
- uses: actions/setup-python@v4
118+
- uses: actions/setup-python@v5
118119
with:
119120
python-version: ${{ matrix.PYTHON_VERSION }}
120121

@@ -125,6 +126,11 @@ jobs:
125126

126127
- name: Install dependencies
127128
run: poetry install --with build --without dev --no-interaction --no-root
129+
env:
130+
# For building psycopg on MacOS
131+
# Required the the same version of openssl as the one used by the Python installation
132+
LDFLAGS: "-L/opt/homebrew/opt/openssl@3.0/lib"
133+
CPPFLAGS: "-I/opt/homebrew/opt/openssl@3.0/include"
128134

129135
- name: Get the version
130136
id: get_version
@@ -136,7 +142,7 @@ jobs:
136142
run: ${{ matrix.BUILD_CMD }}
137143

138144
- name: Upload artifacts
139-
uses: actions/upload-artifact@v3
145+
uses: actions/upload-artifact@v4
140146
with:
141147
name: ${{ matrix.OS }}
142148
path: /tmp/artifacts/*
@@ -147,7 +153,7 @@ jobs:
147153
runs-on: ubuntu-latest
148154
steps:
149155
- name: Download all artifacts
150-
uses: actions/download-artifact@v3
156+
uses: actions/download-artifact@v4
151157
with:
152158
path: /tmp/artifacts
153159

@@ -168,7 +174,7 @@ jobs:
168174
/tmp/artifacts/ubuntu-20.04/operator-${{ steps.get_version.outputs.VERSION }}-linux-amd64.sha256
169175
/tmp/artifacts/linux-arm-runner/operator-${{ steps.get_version.outputs.VERSION }}-linux-arm64.tar.gz
170176
/tmp/artifacts/linux-arm-runner/operator-${{ steps.get_version.outputs.VERSION }}-linux-arm64.sha256
171-
/tmp/artifacts/macos-13/operator-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.tar.gz
172-
/tmp/artifacts/macos-13/operator-${{ steps.get_version.outputs.VERSION }}-darwin-amd64.sha256
177+
/tmp/artifacts/macos-14/operator-${{ steps.get_version.outputs.VERSION }}-darwin-arm64.tar.gz
178+
/tmp/artifacts/macos-14/operator-${{ steps.get_version.outputs.VERSION }}-darwin-arm64.sha256
173179
/tmp/artifacts/windows-latest/operator-${{ steps.get_version.outputs.VERSION }}-windows-amd64.zip
174180
/tmp/artifacts/windows-latest/operator-${{ steps.get_version.outputs.VERSION }}-windows-amd64.sha256

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,14 @@ Head to [Usage](#usage) to launch your operator service.
154154
Pull the latest docker operator docker image:
155155

156156
```bash
157-
docker pull europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.1
157+
docker pull europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.2
158158
```
159159

160160
You can also build the docker image from source by cloning this repo and executing the following command from within
161161
the `v3-operator` folder:
162162

163163
```bash
164-
docker build --pull -t europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.1 .
164+
docker build --pull -t europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.2 .
165165
```
166166

167167
You will execute Operator Service commands using the format below (note the use of flags are optional):
@@ -170,7 +170,7 @@ You will execute Operator Service commands using the format below (note the use
170170
docker run --rm -ti \
171171
-u $(id -u):$(id -g) \
172172
-v ~/.stakewise/:/data \
173-
europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.1 \
173+
europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.2 \
174174
src/main.py COMMAND \
175175
--flagA=123 \
176176
--flagB=xyz
@@ -393,7 +393,7 @@ below:
393393
docker run --restart on-failure:10 \
394394
-u $(id -u):$(id -g) \
395395
-v ~/.stakewise/:/data \
396-
europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.1 \
396+
europe-west4-docker.pkg.dev/stakewiselabs/public/v3-operator:v3.0.2 \
397397
src/main.py start \
398398
--vault=0x3320ad928c20187602a2b2c04eeaa813fa899468 \
399399
--data-dir=/data \

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "v3-operator"
3-
version = "v3.0.1"
3+
version = "v3.0.2"
44
description = "StakeWise operator service for registering vault validators"
55
authors = ["StakeWise Labs <info@stakewise.io>"]
66
package-mode = false

scripts/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ http_copy() {
281281
github_release() {
282282
owner_repo=$1
283283
version=$2
284-
test -z "$version" && version="v3.0.1"
284+
test -z "$version" && version="v3.0.2"
285285
giturl="https://github.com/${owner_repo}/releases/${version}"
286286
json=$(http_copy "$giturl" "Accept:application/json")
287287
test -z "$json" && return 1

0 commit comments

Comments
 (0)