From 0f440c082b51d5223f4a90188b53b46d6aecbe56 Mon Sep 17 00:00:00 2001 From: Dan Vargas Date: Wed, 13 Oct 2021 16:23:49 -0500 Subject: [PATCH 1/2] fix pkg build action for when pkg files are deleted --- .github/workflows/package-pr.yaml | 2 +- .github/workflows/package-push.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package-pr.yaml b/.github/workflows/package-pr.yaml index 78101b0..8ac17a3 100644 --- a/.github/workflows/package-pr.yaml +++ b/.github/workflows/package-pr.yaml @@ -53,7 +53,7 @@ jobs: - name: Build Packages run: | - PACKAGES=$(jq '.[]' -r ${HOME}/files.json | awk -F/ '$2 && $3{ print $2 "-" $3 }' | sort -u) + PACKAGES=$(jq '.[]' -r ${HOME}/files*.json | awk -F/ '$1~/packages/ && $2 && $3{ print $2 "-" $3 }' | sort -u) echo "Packages: $PACKAGES" docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest docker build -t repo-builder repo diff --git a/.github/workflows/package-push.yaml b/.github/workflows/package-push.yaml index ee49487..9de6051 100644 --- a/.github/workflows/package-push.yaml +++ b/.github/workflows/package-push.yaml @@ -30,7 +30,7 @@ jobs: - name: Build Packages run: | - PACKAGES=$(jq '.[]' -r ${HOME}/files.json | awk -F/ '{ print $2 "-" $3 }' | sort -u) + PACKAGES=$(jq '.[]' -r ${HOME}/files*.json | awk -F/ '$1~/packages/ && $2 && $3{ print $2 "-" $3 }' | sort -u) echo "Packages: $PACKAGES" docker pull docker.pkg.github.com/engineer-man/piston/repo-builder:latest docker build -t repo-builder repo From cd2b471eed06c2ff966f1d990a313a869ac4f7a5 Mon Sep 17 00:00:00 2001 From: Cory <34887996+ccall48@users.noreply.github.com> Date: Sun, 17 Oct 2021 11:46:17 +1100 Subject: [PATCH 2/2] add missing libs back into py v3.10 --- packages/python/3.10.0/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/python/3.10.0/build.sh b/packages/python/3.10.0/build.sh index 38796a1..00c839a 100755 --- a/packages/python/3.10.0/build.sh +++ b/packages/python/3.10.0/build.sh @@ -18,3 +18,4 @@ cd .. rm -rf build +bin/pip3 install numpy scipy pandas pycrypto whoosh bcrypt passlib sympy