Skip to content

Commit eb6f2ac

Browse files
committed
making sure env gets set
1 parent 07e6195 commit eb6f2ac

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

.github/workflows/pi-gen.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ on:
1414
jobs:
1515
pi-gen-aryaos:
1616
runs-on: ubuntu-latest
17+
1718
env:
1819
DISABLE_FIRST_BOOT_USER_RENAME: 1
1920
ENABLE_SSH: 1
20-
steps:
21+
22+
steps:
2123
- name: Checkout code
2224
uses: actions/checkout@v2
2325

@@ -39,6 +41,9 @@ jobs:
3941
- name: Set SHARED_FILES dir
4042
run: echo "SHARED_FILES=$(pwd)/shared_files" >> $GITHUB_ENV
4143

44+
- name: Show env
45+
run: env
46+
4247
- name: Build AryaOS image
4348
uses: usimd/pi-gen-action@v1
4449
id: build
@@ -82,4 +87,4 @@ jobs:
8287
uses: actions/upload-artifact@v4
8388
with:
8489
name: pi-gen-image
85-
path: ${{ steps.build.outputs.image-path }}
90+
path: ${{ steps.build.outputs.image-path }}

stages/stage-base/00-install/00-run.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@
2020
# SHARED_FILES=${SHARED_FILES:-../../shared_files}
2121

2222
# ZeroTier
23-
install -v -m 755 "shared_files/base/install_zt.sh" "${ROOTFS_DIR}/usr/src/"
23+
echo "SHARED_FILES=${SHARED_FILES}"
24+
echo "env.SHARED_FILES=${env.SHARED_FILES}"
25+
26+
install -v -m 755 "${SHARED_FILES:-shared_files}/base/install_zt.sh" "${ROOTFS_DIR}/usr/src/"

stages/stage-base/tasks/zerotier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
- name: Upload ZeroTier install script
2020
ansible.builtin.copy:
21-
src: "shared_files/base/install_zt.sh"
21+
src: "${SHARED_FILES}/base/install_zt.sh"
2222
dest: /usr/src
2323
mode: "0755"
2424

0 commit comments

Comments
 (0)