Skip to content

Commit 9676c62

Browse files
committed
workflows: Use upload-private-artifact-action
The weekly u-boot and linux workflows were left behind in the transition. Signed-off-by: Loïc Minier <[email protected]>
1 parent ace48b0 commit 9676c62

File tree

2 files changed

+32
-24
lines changed

2 files changed

+32
-24
lines changed

.github/workflows/linux.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,21 @@ jobs:
6262
debhelper-compat kmod python3 rsync coreutils
6363
scripts/build-linux-deb.sh kernel-configs/systemd-boot.config
6464
65-
- name: Upload results to fileserver
66-
env:
67-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
65+
- name: Stage artifacts for upload
6866
run: |
6967
set -ux
7068
# dcmd from devscripts will be used to parse .changes file
7169
apt -y install --no-install-recommends devscripts
72-
# python3-requests is used by publish_aritfacts.py
73-
apt -y install python3-requests
74-
# copy to fileserver builds and downloads directories
70+
# stage artifacts in a directory
71+
mkdir -v artifacts
72+
cp -av `dcmd *.changes` artifacts
73+
74+
- name: Upload results to fileserver space for downloads
75+
run: |
76+
set -ux
7577
export BUILD_DIR="/fileserver-downloads/${BUILD_ID}"
7678
mkdir -vp "${BUILD_DIR}"
77-
cp -av `dcmd *.changes` "${BUILD_DIR}"
79+
cp -av artifacts/* "${BUILD_DIR}"
7880
7981
# create or update linux-deb-latest symlink
8082
mkdir -vp /fileserver-downloads/qcom-deb-images
@@ -88,8 +90,10 @@ jobs:
8890
)
8991
# perhaps help NFS sync
9092
sync
91-
# instruct fileserver to publish this directory
92-
export URL="${FILESERVER_URL}/${BUILD_ID}/"
93-
.github/workflows/publish_artifacts.py
94-
echo Image available at: ${URL}
93+
94+
- name: Upload private artifacts
95+
uses: qualcomm-linux/upload-private-artifact-action@v1
96+
id: upload_artifacts
97+
with:
98+
path: artifacts
9599

.github/workflows/u-boot.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,10 @@ jobs:
5353
libssl-dev gnutls-dev xxd coreutils gzip mkbootimg
5454
scripts/build-u-boot-rb1.sh
5555
56-
- name: Upload results to fileserver
57-
env:
58-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
56+
- name: Stage artifacts for upload
5957
run: |
6058
set -ux
61-
# python3-requests is used by publish_aritfacts.py
62-
apt -y install python3-requests
63-
64-
export BUILD_DIR="/fileserver-downloads/qcom-deb-images/u-boot-rb1-latest"
65-
mkdir -vp ${BUILD_DIR}
59+
mkdir -v artifacts
6660
cp -av \
6761
u-boot/u-boot-nodtb.bin.gz \
6862
u-boot/dts/upstream/src/arm64/qcom/qrb2210-rb1.dtb \
@@ -71,10 +65,20 @@ jobs:
7165
u-boot/rb1-boot.img \
7266
u-boot/u-boot-cap.bin \
7367
u-boot/u-boot.cab \
74-
${BUILD_DIR}
68+
artifacts
69+
70+
- name: Upload results to fileserver space for downloads
71+
run: |
72+
set -ux
73+
export BUILD_DIR="/fileserver-downloads/qcom-deb-images/u-boot-rb1-latest"
74+
mkdir -vp "${BUILD_DIR}"
75+
cp -av artifacts/* "${BUILD_DIR}"
7576
# perhaps help NFS sync
7677
sync
77-
# instruct fileserver to publish this directory
78-
export URL="${FILESERVER_URL}/${BUILD_ID}/"
79-
.github/workflows/publish_artifacts.py
80-
echo Image available at: ${URL}
78+
79+
- name: Upload private artifacts
80+
uses: qualcomm-linux/upload-private-artifact-action@v1
81+
id: upload_artifacts
82+
with:
83+
path: artifacts
84+

0 commit comments

Comments
 (0)