Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GTK build with dotnet6+xbuild #220

Merged
merged 12 commits into from
Oct 13, 2023
Merged

GTK build with dotnet6+xbuild #220

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c5095e0
build: remove Nuget.Restore.targets
knocte Aug 13, 2023
d504f73
Rename main solution from gwallet to geewallet
knocte Aug 13, 2023
03db5e5
Move non-main solutions to src/ subdir
knocte Aug 13, 2023
a671a9c
*.sln: update
knocte Aug 15, 2023
c8c59c2
Frontend.XF.GTK: add DLL refs for project refs
aarani Aug 21, 2023
7f6c88d
scripts: using legacy & non-legacy tools together
knocte Aug 15, 2023
14c46b1
scripts,GitHubCI: remove curl as a dependency
knocte Aug 15, 2023
8ee7f26
CI: add more deps to stockdotnet6-stockmono lane
aarani Aug 21, 2023
acab2ad
CI: build snap packages with stockdotnet6+xbuild
aarani Aug 21, 2023
06efc5b
scripts/make: build XF frontend when dotnet exists
aarani Aug 24, 2023
3e02b82
GitHubCI: cosmetic, use `--yes` instead of `-y`
knocte Oct 13, 2023
4d00028
Introduce .git-blame-ignore-revs
knocte Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,11 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl fsharp nunit-console
run: |
# needed by fsx submodule
sudo apt install --yes curl

sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make fsharp nunit-console

# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
Expand Down Expand Up @@ -284,7 +288,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6

# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
Expand Down Expand Up @@ -326,7 +330,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6
- name: install last version of mono (Microsoft APT repositories)
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh

Expand Down Expand Up @@ -370,8 +374,9 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6 mono-xbuild

run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6 mono-xbuild fsharp
- name: install GTK libs (dependency of GTK frontend)
run: sudo apt install -y libgtk2.0-cil-dev
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should use --yes here, not -y

# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
run: git config --global --add safe.directory '*'
Expand Down Expand Up @@ -412,7 +417,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl fsharp nunit-console
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make fsharp nunit-console
- name: install last version of mono (Microsoft APT repositories)
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh

Expand Down Expand Up @@ -507,7 +512,11 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo apt install --yes git make curl fsharp nunit-console
run: |
# needed by fsx submodule
sudo apt install --yes curl

sudo apt install --yes git make fsharp nunit-console

# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
Expand Down Expand Up @@ -543,7 +552,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
run: sudo apt install --yes git make curl fsharp nunit-console
run: sudo apt install --yes git make fsharp nunit-console
- name: install last version of mono (Microsoft APT repositories)
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh

Expand Down Expand Up @@ -631,15 +640,14 @@ jobs:
- name: Install snap tools
run: |
sudo apt update
sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
./scripts/install_snapcraft.sh

# hack to disable dotnet detection (can't use apt purge because github VM seems to have it installed in different way)
# NOTE: you might think an easier way to do this would be use container:\nimage: ubuntu22.04 and then not install dotnet pkg,
# hack to disable msbuild detection
# NOTE: you might think an easier way to do this would be use container:\nimage: ubuntu22.04 and then not install msbuild,
# but that doesn't work because we get the following error when trying to install snapcraft via `snap install --classic`:
# > error: cannot communicate with server: Post "http://localhost/v2/snaps/snapcraft": dial unix /run/snapd.socket: connect: no such file or directory
- name: HACK to emulate dotnet uninstall
run: sudo rm `which dotnet`
- name: HACK to emulate msbuild uninstall
run: sudo rm `which msbuild`

- name: Generate snap package
run: |
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ TestResult.xml
# backup files of some editors such as nano
*~

# autogenerated file by configure.sh
before.gwallet.core-legacy.sln.targets

# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

Expand Down
170 changes: 0 additions & 170 deletions NuGet.Restore.targets
View file
Open in desktop

This file was deleted.

13 changes: 6 additions & 7 deletions gwallet.sln → geewallet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,13 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "GWallet.Frontend.XF", "src\
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "GWallet.Frontend.XF.iOS", "src\GWallet.Frontend.XF.iOS\GWallet.Frontend.XF.iOS.fsproj", "{5DD656CE-3319-46BB-B47F-BBED8CC722FD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InfraLib", "InfraLib", "{6EE07541-91A1-42C2-A21F-2809BBDC2F50}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Fsdk", "Fsdk", "{6EE07541-91A1-42C2-A21F-2809BBDC2F50}"
ProjectSection(SolutionItems) = preProject
scripts\fsx\InfraLib\Misc.fs = scripts\fsx\InfraLib\Misc.fs
scripts\fsx\InfraLib\Unix.fs = scripts\fsx\InfraLib\Unix.fs
scripts\fsx\InfraLib\Taiga.fs = scripts\fsx\InfraLib\Taiga.fs
scripts\fsx\InfraLib\Process.fs = scripts\fsx\InfraLib\Process.fs
scripts\fsx\InfraLib\Network.fs = scripts\fsx\InfraLib\Network.fs
scripts\fsx\InfraLib\Git.fs = scripts\fsx\InfraLib\Git.fs
scripts\fsx\Fsdk\Misc.fs = scripts\fsx\Fsdk\Misc.fs
scripts\fsx\Fsdk\Unix.fs = scripts\fsx\Fsdk\Unix.fs
scripts\fsx\Fsdk\Process.fs = scripts\fsx\Fsdk\Process.fs
scripts\fsx\Fsdk\Network.fs = scripts\fsx\Fsdk\Network.fs
scripts\fsx\Fsdk\Git.fs = scripts\fsx\Fsdk\Git.fs
EndProjectSection
EndProject
Global
Expand Down
Loading
Loading