From 7c6542104e85effee55861e976d385d4a566f09a Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 5 Apr 2024 21:06:54 +0800 Subject: [PATCH 1/2] fix(ci): git safe directory for update Signed-off-by: madomado --- .github/workflows/update.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 358716c0fb..9ee672acc3 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -17,11 +17,12 @@ jobs: fetch-depth: 0 ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} - - name: Install SSH signing key + - name: Install SSH signing key & Set up git repository run: | mkdir -p ${{ runner.temp }} echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key chmod 0700 ${{ runner.temp }}/signing_key + git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Run Update run: anda update -vv @@ -31,7 +32,6 @@ jobs: - name: Save run: | - git config --global --add safe.directory "*" if [[ `git status --porcelain` ]]; then git config user.name "Raboneko" git config user.email "raboneko@fyralabs.com" From cc825c9fe267821e677095f298fc1e9fcf7ed56a Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 5 Apr 2024 21:07:50 +0800 Subject: [PATCH 2/2] nightly too Signed-off-by: madomado --- .github/workflows/update-nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index c0786a3c6c..e8d3e05499 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -17,11 +17,12 @@ jobs: fetch-depth: 0 ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} - - name: Install SSH signing key + - name: Install SSH signing key & Set up git repository run: | mkdir -p ${{ runner.temp }} echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key chmod 0700 ${{ runner.temp }}/signing_key + git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Run Nightly Update run: anda update -vv --filters nightly=1 @@ -30,7 +31,6 @@ jobs: - name: Save run: | - git config --global --add safe.directory "*" if [[ `git status --porcelain` ]]; then git config user.name "Raboneko" git config user.email "raboneko@fyralabs.com"