From de8dc87ecf2d0388ff1f49cbc09ad9840febe4eb Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 6 Jan 2024 11:19:35 -0800 Subject: [PATCH] reorder Copr yaml We need to have git setup before trying to get the build number. Signed-off-by: Dirk Hohndel --- .github/workflows/fedora-copr-build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/fedora-copr-build.yml b/.github/workflows/fedora-copr-build.yml index 749b68dc6..a13c89b64 100644 --- a/.github/workflows/fedora-copr-build.yml +++ b/.github/workflows/fedora-copr-build.yml @@ -15,6 +15,16 @@ jobs: - name: Check out sources uses: actions/checkout@v1 + - name: Setup build dependencies in the Fedora container + run: | + dnf -y install @development-tools @rpm-development-tools + dnf -y install copr-cli make + + - name: setup git + run: | + git config --global --add safe.directory /__w/subsurface/subsurface + git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer + - name: atomically create or retrieve the build number id: version_number if: github.event_name == 'push' @@ -43,16 +53,6 @@ jobs: cp packaging/copr/config.copr "$HOME/.config/copr" sed -i "s/API_TOKEN/$API_TOKEN/;s/API_LOGIN/$API_LOGIN/" "$HOME/.config/copr" - - name: Setup build dependencies in the Fedora container - run: | - dnf -y install @development-tools @rpm-development-tools - dnf -y install copr-cli make - - - name: setup git - run: | - git config --global --add safe.directory /__w/subsurface/subsurface - git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer - - name: Checkout googlemaps run: | cd ..