Skip to content

Commit

Permalink
修复linux构建的路径错误,win构建的构建器错误
Browse files Browse the repository at this point in the history
  • Loading branch information
SourLemonJuice committed Jun 16, 2024
1 parent 3aaa373 commit fabd67d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,18 @@ on:
jobs:
build:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./source/
steps:
- uses: actions/checkout@v4
- name: Build with make
working-directory: ./source/
env:
CI_HOST_INFO: GitHub Build Workflow
run: make i18nglish.out build_host_description="${CI_HOST_INFO} ID:${GITHUB_RUN_ID} for ${GITHUB_REF}" ${Make_releaseBuild_arg}
- name: Upload executable file
uses: actions/upload-artifact@v4
with:
name: i18nglish-linux
path: ./i18nglish.out
path: source/i18nglish.out
if-no-files-found: error
retention-days: 7

Expand All @@ -46,6 +44,6 @@ jobs:
with:
msystem: UCRT64
update: true
install: make git mingw-w64-ucrt-x86_64-gcc
install: make git mingw-w64-ucrt-x86_64-clang
- name: make with MSYS2
run: make i18nglish.exe
2 changes: 1 addition & 1 deletion source/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ i18nglish.out: $(source_files)

# just hope the clang and gcc flags are exactly the same
i18nglish.exe: $(source_files)
/usr/bin/x86_64-w64-mingw32-gcc $(source_files) \
clang $(source_files) \
--output $(executable_base_name).exe \
-DAPP_GIT_COMMIT_INFO="\"$(git_commit_info)\"" \
-DAPP_BUILD_HOST_DESCRIPTION="\"$(build_host_description)\"" \
Expand Down

0 comments on commit fabd67d

Please sign in to comment.