From e5a0b09b2b228160f11adb62901fb1f1e2091825 Mon Sep 17 00:00:00 2001
From: Serge Bazanski <q3k@q3k.org>
Date: Sun, 13 Aug 2023 16:29:47 +0200
Subject: [PATCH] ci: first attempt at fixing dist tarballs
---
.gitlab-ci.yml | 4 ++--
nix/docker-image.nix | 1 +
tools/dist.sh | 9 ++++++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6daa3261e6..2be181a976 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
default:
# built via:
# docker load < $(nix-build nix/docker-image.nix)
- image: registry.k0.hswaw.net/q3k/flow3r-build:v4ljgs5czzm6j79m7r30vw6xz6990kkv
+ image: registry.k0.hswaw.net/q3k/flow3r-build:krgzk4xwf485pi8xn6g12vfccvyc38aj
clang-tidy:
stage: check
@@ -80,4 +80,4 @@ dist:
script:
- bash tools/dist.sh
artifacts:
- paths: ['dist']
\ No newline at end of file
+ paths: ['dist']
diff --git a/nix/docker-image.nix b/nix/docker-image.nix
index 4e08274202..0c227bedf1 100644
--- a/nix/docker-image.nix
+++ b/nix/docker-image.nix
@@ -31,6 +31,7 @@ pkgs.dockerTools.buildImage {
gcc gnused findutils gnugrep
git wget gnumake
cmake ninja pkgconfig
+ gnutar curl
];
pathsToLink = [ "/bin" ];
};
diff --git a/tools/dist.sh b/tools/dist.sh
index 240c86375f..08f92f7383 100755
--- a/tools/dist.sh
+++ b/tools/dist.sh
@@ -77,4 +77,11 @@ Then, run esptool.py with the following arguments:
EOF
mkdir -p dist
-tar -cjf "dist/${name}.tar.bz2" -C "${tmpdir}" "${name}"
+tar="dist/${name}.tar.bz2"
+tar -cjf "${tar}" -C "${tmpdir}" "${name}"
+
+if [ ! -z "$CI_JOB_TOKEN" ]; then
+ curl --header "JOB-TOKEN: $CI_JOB_TOKEN" \
+ --upload-file "${tar}" \
+ "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/flow3r-firmware/${version}/${name}.tar.bz2"
+fi
--
GitLab