From 3b3b45038ff8172a1063ce4f7ac374451afbc800 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Sun, 26 Jun 2022 09:22:22 +0200 Subject: [PATCH] CI: Fix git usage inside Flatpak action container This fix the lack of hash in the Flatpak artifact filename. --- .github/workflows/flatpak.yml | 1 + .github/workflows/main.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index e7f2eef1f..11dd6587e 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -39,6 +39,7 @@ jobs: - name: 'Setup build environment' id: setup run: | + git config --global --add safe.directory $GITHUB_WORKSPACE echo "::set-output name=commitHash::$(git rev-parse --short=9 HEAD)" - name: Build Flatpak Manifest diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b61671dff..d519b5225 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -389,6 +389,7 @@ jobs: - name: 'Setup build environment' if: ${{ success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1') }} run: | + git config --global --add safe.directory $GITHUB_WORKSPACE echo "OBS_GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV echo "OBS_GIT_HASH=$(git rev-parse --short=9 HEAD)" >> $GITHUB_ENV echo "OBS_GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV