Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mark current directory as safe when creating archive #638

Merged
merged 1 commit into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .copr/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ installdeps:
dnf -y install gcc gcc-c++ git jq meson systemd-devel rpm-build

srpm: installdeps
git config --global --add safe.directory "$(shell pwd)"
./build-scripts/build-srpm.sh
cp rpmbuild/SRPMS/*.src.rpm $(outdir)
4 changes: 4 additions & 0 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ jobs:
# Use githash of a tested commit instead of merge commit
ref: ${{ github.event.pull_request.head.sha }}

- name: Mark source directory as safe
run: |
git config --global --add safe.directory $(pwd)

- name: Perform build
run: |
./build-scripts/build-rpm.sh $ARTIFACTS_DIR
Expand Down
1 change: 1 addition & 0 deletions .packit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ srpm_build_deps:

actions:
post-upstream-clone:
- bash -c 'git config --global --add safe.directory $(pwd)'
- bash -c './build-scripts/create-spec.sh'

get-current-version:
Expand Down
3 changes: 0 additions & 3 deletions build-scripts/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ function release(){
# Used for official releases. Increment if necessary
RELEASE="1"
else
# Mark current directory as safe for git to be able to parse git hash
git config --global --add safe.directory $(pwd)

# Used for nightly builds
RELEASE="0.$(date +%04Y%02m%02d%02H%02M).git$(git rev-parse --short ${GITHUB_SHA:-HEAD})"
fi
Expand Down