Skip to content

Commit

Permalink
Merge pull request #4 from Flying-Tom/ci-fix
Browse files Browse the repository at this point in the history
Fix ubuntu and windows CI
  • Loading branch information
Flying-Tom authored Sep 10, 2024
2 parents 2699101 + 6acfcce commit 94876f9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 60 deletions.
50 changes: 0 additions & 50 deletions .github/workflows/release-macos.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
type: "zip"
directory: ${{github.workspace}}/release/
filename: "TDGame-Ubuntu-${{github.ref_name}}.zip"
filename: "TDGame-ubuntu-${{github.ref_name}}.zip"

- name: Upload Release
uses: softprops/action-gh-release@v2
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/release-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- ci-fix
tags:
- "v*.*.*"

Expand All @@ -17,30 +18,25 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up MinGW
uses: egor-tensin/setup-mingw@v2
with:
platform: x64

- name: Install Qt
uses: jurplel/install-qt-action@v4
uses: jurplel/install-qt-action@v2
with:
arch: "win64_mingw81"

- name: Configure CMake
run: cmake -G "MinGW Makefiles" -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
run: cmake --build ${{github.workspace}}\build --config ${{env.BUILD_TYPE}}

- name: Pack Resources
if: startsWith(github.ref, 'refs/tags/v')
run: |
mkdir ${{github.workspace}}\release
Xcopy ${{github.workspace}}\build\TDGame.exe ${{github.workspace}}\release
Xcopy /E /I ${{github.workspace}}\resource\maps ${{github.workspace}}\release\maps
cd ${{env.Qt5_Dir}}/bin/
./windeployqt.exe ${{github.workspace}}\release\TDGame.exe
cd ${{env.Qt5_Dir}}\bin\
.\windeployqt.exe ${{github.workspace}}\release\TDGame.exe
- name: Archive Release
uses: thedoctor0/zip-release@0.7.5
Expand Down

0 comments on commit 94876f9

Please sign in to comment.