Skip to content

Commit

Permalink
Fix Linux release zip not containing the backend (#519) #patch
Browse files Browse the repository at this point in the history
* Create test_linux_build.yml

* Update test_linux_build.yml

* Update test_linux_build.yml

* Update test_linux_build.yml

* update Fronter

* Update create_release.yml

* Update test_linux_build.yml

* Update Fronter

* test_wf_windows

* Update test_linux_build.yml

* Update Fronter

* Delete test_linux_build.yml

* Update create_release.yml
  • Loading branch information
IhateTrains authored Jan 9, 2022
1 parent 31f7f09 commit 29cff82
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 42 deletions.
48 changes: 7 additions & 41 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,17 @@ jobs:
run: |
cd ImperatorToCK3/Data_Files/configurables
printf "\nversion = ${{ needs.create_release.outputs.tag }}" >> version.txt
- name: "Build frontend"
uses: ./Fronter/.github/actions/build_frontend
with:
msbuild_path: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/MSBuild/Current/Bin/MSBuild.exe"
- name: "Build backend"
run: |
cd ImperatorToCK3
dotnet publish -p:PublishProfile=win-x64 -c:Release
cd ..
Remove-Item -LiteralPath "Release\ImperatorToCK3" -Force -Recurse
Xcopy /E /Y Publish Release
- name: "Build frontend"
run: |
cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\"
.\MSBuild.exe -m -p:Configuration=Release -p:Platform="x64" $Env:GITHUB_WORKSPACE\ImperatorToCK3.sln -target:Fronter
- name: "Build updater executable"
run: |
cd Fronter/Updater
pip3 install -r requirements.txt
pyinstaller --onefile --icon=updater.ico updater.py
mkdir ../../Release/Updater
mv dist/updater.exe ../../Release/Updater/updater.exe
- name: "Save commit ID"
run: |
cd $Env:GITHUB_WORKSPACE\ImperatorToCK3\
Expand Down Expand Up @@ -109,42 +102,15 @@ jobs:
run: |
cd ImperatorToCK3/Data_Files/configurables
printf "\nversion = ${{ needs.create_release.outputs.tag }}" >> version.txt
- name: "Build frontend"
uses: ./Fronter/.github/actions/build_frontend
- name: "Build backend"
run: |
cd ImperatorToCK3
dotnet publish -p:PublishProfile=linux-x64 -c:Release
cd ..
rm -r "Release/ImperatorToCK3"
cp -R Publish/ Release/
- name: "Build frontend"
run: |
sudo apt install libcurl4-openssl-dev
sudo apt-key adv --fetch-keys https://repos.codelite.org/CodeLite.asc
sudo apt-add-repository 'deb https://repos.codelite.org/wx3.1.5/ubuntu/ focal universe'
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt update
sudo apt install gcc-11 g++-11
sudo apt install libwxbase3.1-0-unofficial libwxbase3.1unofficial-dev libwxgtk3.1-0-unofficial libwxgtk3.1unofficial-dev wx3.1-headers wx-common
# Link gcc-11 and g++-11 to their standard commands
sudo ln -s /usr/bin/gcc-11 /usr/local/bin/gcc
sudo ln -s /usr/bin/g++-11 /usr/local/bin/g++
# Export CC and CXX to tell cmake which compiler to use
export CC=/usr/bin/gcc-11
export CXX=/usr/bin/g++-11
# Check versions of gcc, g++ and cmake
gcc -v && g++ -v && cmake --version
rm -rf Release/
cd Fronter
./build_linux.sh
mv Release ../
- name: "Build updater executable"
run: |
cd Fronter/Updater
pip3 install -r requirements.txt
pyinstaller --onefile --icon=updater.ico updater.py
mkdir ../../Release/Updater
mv dist/updater ../../Release/Updater/updater
cp -R Publish/* Release/
- name: "Save commit ID"
run: |
git rev-parse HEAD > Release/commit_id.txt
Expand Down
2 changes: 1 addition & 1 deletion Fronter

0 comments on commit 29cff82

Please sign in to comment.