Skip to content

Commit

Permalink
CI: cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
grulja committed Jan 25, 2021
1 parent e7e357b commit 4ad7ce0
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ jobs:
run: |
choco install nsis
choco install dos2unix
#choco install pkgconfiglite
- name: Install Qt
uses: jurplel/install-qt-action@v2
with:
Expand Down Expand Up @@ -157,8 +156,6 @@ jobs:
- name: Build MediaWriter
shell: bash
run: |
#export PATH=$(echo "$PATH" | sed -e 's/:\/c\/ProgramData\/Chocolatey\/bin//' | sed -e 's/:\/c\/Strawberry\/c\/bin//')
#export PATH="$Qt5_Dir/../../Tools/mingw730_32/bin:$PATH"
#FIXME: pkg-config seems to be somehow broken and pulls in debug versions of Qt libraries instead
sed s@PKGCONFIG\ +=\ adwaita-qt@LIBS\ +=\ -L\$\$[QT_INSTALL_BINS]\ -ladwaitaqt@ -i app/app.pro
sed s@PKGCONFIG\ +=\ adwaita-qt@LIBS\ +=\ -L\$\$[QT_INSTALL_BINS]\ -ladwaitaqt@ -i theme/theme.pro
Expand All @@ -179,7 +176,7 @@ jobs:
cp -r ../../../theme/qml/* ./QtQuick/Controls.2/org.fedoraproject.AdwaitaTheme
cp -r ../../../theme/qmldir ./org/fedoraproject/AdwaitaTheme
cp -r ../../theme/release/adwaitathemeplugin.dll ./org/fedoraproject/AdwaitaTheme
$Qt5_Dir/bin/windeployqt -qmldir ../../.. mediawriter.exe --release
$Qt5_Dir/bin/windeployqt -qmldir ../../.. mediawriter.exe
cp $Qt5_Dir/bin/libadwaita*.dll .
cp $Qt5_Dir/bin/libstdc*.dll .
cp $Qt5_Dir/bin/libwinpthread*.dll .
Expand Down

0 comments on commit 4ad7ce0

Please sign in to comment.