Skip to content

Commit 886a6c6

Browse files
committed
Fix issues and typos
1 parent c4d7c4b commit 886a6c6

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

.github/workflows/daily-builds-arm.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ jobs:
109109
submodules: recursive
110110
token: ${{ secrets.PAT }}
111111

112+
- name: "Unlock keychain for current session" # Required beacuse ARM builds run on macos
113+
run: security -v unlock-keychain -p ${{ secrets.SELF_HOSTED_RUNNER_PASSWORD }} ~/Library/Keychains/login.keychain-db
114+
112115
- name: "Checkout correct versions in submodules"
113116
run: |
114117
cd mage && git checkout ${{ env.MAGE_TAG }}
@@ -145,6 +148,9 @@ jobs:
145148
submodules: recursive
146149
token: ${{ secrets.PAT }}
147150

151+
- name: "Unlock keychain for current session" # Required beacuse ARM builds run on macos
152+
run: security -v unlock-keychain -p ${{ secrets.SELF_HOSTED_RUNNER_PASSWORD }} ~/Library/Keychains/login.keychain-db
153+
148154
- name: "Checkout correct versions in submodules"
149155
run: |
150156
cd mage && git checkout ${{ env.MAGE_TAG }}
@@ -189,6 +195,9 @@ jobs:
189195
submodules: recursive
190196
token: ${{ secrets.PAT }}
191197

198+
- name: "Unlock keychain for current session" # Required beacuse ARM builds run on macos
199+
run: security -v unlock-keychain -p ${{ secrets.SELF_HOSTED_RUNNER_PASSWORD }} ~/Library/Keychains/login.keychain-db
200+
192201
- name: "Checkout correct versions in submodules"
193202
run: |
194203
cd lab && git checkout ${{ env.LAB_TAG }}
@@ -231,6 +240,9 @@ jobs:
231240
submodules: recursive
232241
token: ${{ secrets.PAT }}
233242

243+
- name: "Unlock keychain for current session" # Required beacuse ARM builds run on macos
244+
run: security -v unlock-keychain -p ${{ secrets.SELF_HOSTED_RUNNER_PASSWORD }} ~/Library/Keychains/login.keychain-db
245+
234246
- name: "Checkout correct versions in submodules"
235247
run: |
236248
cd lab && git checkout ${{ env.LAB_TAG }}
@@ -275,6 +287,9 @@ jobs:
275287
submodules: recursive
276288
token: ${{ secrets.PAT }}
277289

290+
- name: "Unlock keychain for current session" # Required beacuse ARM builds run on macos
291+
run: security -v unlock-keychain -p ${{ secrets.SELF_HOSTED_RUNNER_PASSWORD }} ~/Library/Keychains/login.keychain-db
292+
278293
- name: "Checkout correct versions in submodules"
279294
run: |
280295
cd lab && git checkout ${{ env.LAB_TAG }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# For mage
22
ARG PY_VERSION_DEFAULT=3.9
3+
ARG MAGE_IMAGE
34

45
FROM debian:bullseye as base
56

@@ -32,8 +33,7 @@ RUN apt-get update && apt-get install -y \
3233
###################################################################################################################################################
3334

3435
# MAGE
35-
ARG MAGE_IMAGE
36-
FROM ${MAGE_IMAGE} as mage-dev
36+
FROM $MAGE_IMAGE as mage-dev
3737

3838
###################################################################################################################################################
3939

scripts/docker_image_platform.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ build() {
4040
;;
4141
--mage-from-tar)
4242
docker_load_out=$(docker load < $2)
43-
mage_image=${docker_load_out#Loaded image:}
43+
mage_image=$(echo ${docker_load_out#Loaded image:} | tr -d '[:blank:]')
4444
;;
4545
*)
4646
print_help
4747
;;
4848
esac
49-
49+
5050
platform_package_file="memgraph-$TARGET_ARCH.deb"
5151
cp $MG_PACKAGE_PATH \
5252
$MGPLAT_ROOT/$platform_package_file

0 commit comments

Comments
 (0)