From 9200f1eef708f4bf4d5b2b4c1e53466fac7e776e Mon Sep 17 00:00:00 2001 From: David Freilich Date: Sun, 8 May 2022 18:02:51 +0300 Subject: [PATCH 1/2] Remove project.toml, and set it to be ok anyways Signed-off-by: David Freilich --- .github/workflows/delivery-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/delivery-docker.yml b/.github/workflows/delivery-docker.yml index c59bdd539..006b99d5b 100644 --- a/.github/workflows/delivery-docker.yml +++ b/.github/workflows/delivery-docker.yml @@ -50,8 +50,8 @@ jobs: - name: Setup Working Dir shell: bash run: | + rm project.toml || true cp head/.github/workflows/delivery/docker/project.toml project.toml - rm buildpack.yml - name: Determine App Name run: 'echo "IMG_NAME=${{ env.USERNAME }}/${{ env.IMG_NAME }}" >> $GITHUB_ENV' - name: Login to Dockerhub From e2846737fe31eacd331f3678ce920627e8788953 Mon Sep 17 00:00:00 2001 From: David Freilich Date: Sun, 8 May 2022 18:09:57 +0300 Subject: [PATCH 2/2] Fix archlinux issue Signed-off-by: David Freilich --- .github/workflows/delivery/archlinux/publish-package.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/delivery/archlinux/publish-package.sh b/.github/workflows/delivery/archlinux/publish-package.sh index f096d7c65..40c28472d 100755 --- a/.github/workflows/delivery/archlinux/publish-package.sh +++ b/.github/workflows/delivery/archlinux/publish-package.sh @@ -40,6 +40,9 @@ echo '> Cloning aur...' git clone "ssh://aur@aur.archlinux.org/${PACKAGE_NAME}.git" "${PACKAGE_AUR_DIR}" chown -R archie "${PACKAGE_AUR_DIR}" pushd "${PACKAGE_AUR_DIR}" > /dev/null + echo '> Declare directory ${PACKAGE_AUR_DIR} as safe' + git config --global --add safe.directory "${PACKAGE_AUR_DIR}" + echo '> Checking out master...' git checkout master