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.

Sign up for GitHub

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

Add git to msys2 action #788

Merged
merged 3 commits into from
Jan 22, 2025
Merged

Add git to msys2 action #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4af2331
Add git to msys2 action
ktmf01 Jan 22, 2025
f91d4eb
Try another way
ktmf01 Jan 22, 2025
2966729
Try another fix
ktmf01 Jan 22, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/msys2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Build, run tests and prepare package
shell: msys2 {0}
run: |
PATH=$PATH:/c/ProgramData/chocolatey/bin/
PATH=$PATH:/c/ProgramData/chocolatey/bin/:/c/Program\ Files/Git/bin/
./autogen.sh
./configure --enable-static --disable-shared # This is because the libtool helper script doesn't handle UTF-8 filenames correctly
make LDFLAGS='-all-static' # Otherwise ogg isn't linked statically
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ AC_CHECK_PROG(GIT_FOUND,git,yes)

if test x$GIT_FOUND$enable_version_from_git = "xyesyes"; then
GIT_COMMIT_TAG=`git -C $srcdir --git-dir=.git describe --tags --exact-match 2>/dev/null`
GIT_COMMIT_HASH=`git -C $srcdir --git-dir=.git log -1 --pretty=format:%h 2>/dev/null`
GIT_COMMIT_HASH=`git -C $srcdir --git-dir=.git log -1 --pretty=format:%H 2>/dev/null | head -c 8`
GIT_COMMIT_DATE=`git -C $srcdir --git-dir=.git log -1 --pretty=format:%cd --date=format:%Y%m%d 2>/dev/null`
if test ${#GIT_COMMIT_HASH} = 8 && test ${#GIT_COMMIT_DATE} = 8; then
GIT_COMMIT_VERSION_AVAIL=yes
Expand Down
Loading