Skip to content
This repository has been archived by the owner on Feb 13, 2024. It is now read-only.

Commit

Permalink
Attempt fixing build errors (actions)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MartinBriza
MartinBriza committed Mar 31, 2020
1 parent b38cae0 commit 9737ca5
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 17 deletions.
47 changes: 31 additions & 16 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
security default-keychain -s ~/Library/Keychains/build.keychain
# Mac Developer Certificate
base64 -D <<< "${{ secrets.CERT_MACOS_DEVELOPMENT }}" > Bundle_cert_macos_development.p12
security import ./Bundle_cert_macos_development.p12 -k ~/Library/Keychains/build.keychain -P ${{ secrets.CERT_MACOS_DEVELOPMENT_PASSWORD }} -T /usr/bin/codesign
base64 -D <<< "${{ secrets.CERT_MACOS_DEVELOPER }}" > Bundle_cert_macos_developer.p12
security import ./Bundle_cert_macos_developer.p12 -k ~/Library/Keychains/build.keychain -P ${{ secrets.CERT_MACOS_DEVELOPER_PASSWORD }} -T /usr/bin/codesign
# Application Certificate
base64 -D <<< "${{ secrets.CERT_MACOS_APPLICATION }}" > Bundle_cert_macos_distribution.p12
Expand Down Expand Up @@ -79,9 +79,12 @@ jobs:
fetch-depth: 1
- name: Install dependencies
run: |
sudo apt update
sudo apt install libxss1 libgstreamer-plugins-base1.0-0 libgstreamer1.0-0 qt5-default libqt5gui5 libqt5webengine5 libqt5webenginecore5 libqt5webenginewidgets5 libqt5printsupport5 libqt5quickwidgets5 libqt5x11extras5 libxss1
sudo apt install patchelf binutils cmake pkg-config qtbase5-dev qtwebengine5-dev libqt5x11extras5-dev qtbase5-private-dev libssl-dev libxss-dev libxmu-dev
# try getting the deps 10 times before solving this right
for i in {1..10}; do
sudo apt update
sudo apt install libxss1 libgstreamer-plugins-base1.0-0 libgstreamer1.0-0 qt5-default libqt5gui5 libqt5webengine5 libqt5webenginecore5 libqt5webenginewidgets5 libqt5printsupport5 libqt5quickwidgets5 libqt5x11extras5 libxss1
sudo apt install patchelf binutils cmake pkg-config qtbase5-dev qtwebengine5-dev libqt5x11extras5-dev qtbase5-private-dev libssl-dev libxss-dev libxmu-dev
done
- name: Build the Linux binary
run: |
bash ./dist/linux/package.sh build
Expand All @@ -99,10 +102,13 @@ jobs:
fetch-depth: 1
- name: Install dependencies
run: |
sudo apt update
sudo apt install libxss1 libgstreamer-plugins-base1.0-0 libgstreamer1.0-0
sudo apt install patchelf binutils cmake pkg-config libssl-dev libxss-dev libxmu-dev
sudo apt install dbus libfreetype6 fontconfig libx11-6 libx11-xcb1 libgl1-mesa-dev libnss3 libasound2 libxcomposite1 libxcursor1 libxi6 libxtst6 wget
# try getting the deps 10 times before solving this right
for i in {1..10}; do
sudo apt update
sudo apt install libxss1 libgstreamer-plugins-base1.0-0 libgstreamer1.0-0
sudo apt install patchelf binutils cmake pkg-config libssl-dev libxss-dev libxmu-dev
sudo apt install dbus libfreetype6 fontconfig libx11-6 libx11-xcb1 libgl1-mesa-dev libnss3 libasound2 libxcomposite1 libxcursor1 libxi6 libxtst6 wget
done
- name: Fetch and install binary Qt
run: |
bash ./dist/linux/install-qt.sh 5.12.5
Expand Down Expand Up @@ -131,8 +137,11 @@ jobs:
gpg --import <<< "${{ secrets.CERT_LINUX_DEB64 }}"
- name: Install dependencies
run: |
sudo apt update
sudo apt install devscripts cmake debhelper pkg-config qtbase5-dev qtwebengine5-dev libqt5x11extras5-dev qtbase5-private-dev libssl-dev libxss-dev libxmu-dev
# try getting the deps 10 times before solving this right
for i in {1..10}; do
sudo apt update
sudo apt install devscripts cmake debhelper pkg-config qtbase5-dev qtwebengine5-dev libqt5x11extras5-dev qtbase5-private-dev libssl-dev libxss-dev libxmu-dev
done
- name: Build a Debian package
run: |
TAG_NAME=$(./dist/get-tag-name.sh)
Expand All @@ -156,13 +165,19 @@ jobs:
fetch-depth: 1
- name: Install Flatpak
run: |
sudo apt update
sudo apt install flatpak flatpak-builder
# try getting the deps 10 times before solving this right
for i in {1..10}; do
sudo apt update
sudo apt install flatpak flatpak-builder
done
- name: Install Flatpak KDE SDK
run: |
sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
sudo flatpak install --system -y flathub org.kde.Platform//5.12
sudo flatpak install --system -y flathub org.kde.Sdk//5.12
# try getting the deps 10 times before solving this right
for i in {1..10}; do
sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
sudo flatpak install --system -y flathub org.kde.Platform//5.12
sudo flatpak install --system -y flathub org.kde.Sdk//5.12
done
- name: Build Linux Flatpak package - KDE based
run: |
pushd dist/linux/flatpak
Expand Down
8 changes: 7 additions & 1 deletion src/lib/windows/TogglDesktopDLL/TogglDesktopDLL.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,21 +172,25 @@
<LinkIncremental>false</LinkIncremental>
<RunCodeAnalysis>false</RunCodeAnalysis>
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\..</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='StoreRelease|Win32'">
<LinkIncremental>false</LinkIncremental>
<RunCodeAnalysis>false</RunCodeAnalysis>
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\..</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<RunCodeAnalysis>false</RunCodeAnalysis>
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\..</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='StoreRelease|x64'">
<LinkIncremental>false</LinkIncremental>
<RunCodeAnalysis>false</RunCodeAnalysis>
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\..</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
Expand All @@ -198,6 +202,7 @@
<LinkIncremental>true</LinkIncremental>
<RunCodeAnalysis>false</RunCodeAnalysis>
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\..</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
Expand All @@ -209,6 +214,7 @@
<LinkIncremental>true</LinkIncremental>
<RunCodeAnalysis>false</RunCodeAnalysis>
<PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)\..\..\..</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug.Broken|Win32'">
<ClCompile>
Expand Down Expand Up @@ -672,4 +678,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

0 comments on commit 9737ca5

Please sign in to comment.