Skip to content

Commit

Permalink
Attempt to fix Windows builds with a simple change. It's not going to…
Browse files Browse the repository at this point in the history
… be that easy unfortunately.
  • Loading branch information
Dadoum committed Mar 2, 2024
1 parent cb8e05e commit 545820a
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions .github/workflows/build-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ jobs:
${{github.workspace}}/bin/sideloader-cli-macOS-arm64
build-windows-x86_64:
runs-on: ubuntu-22.04
runs-on: windows-2019

steps:
- uses: actions/checkout@v3
Expand All @@ -267,31 +267,31 @@ jobs:
with:
compiler: ldc-1.33.0

- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y libz-dev elfutils clang lld 7zip

- name: Set-up Windows cross-compilation
run: |
mkdir -p $HOME/.ldc/
cat << EOF | tee $HOME/.ldc/ldc2.conf
"x86_64-.*-windows-msvc":
{
// default switches injected before all explicit command-line switches
switches = [
"-defaultlib=phobos2-ldc,druntime-ldc",
];
// default switches appended after all explicit command-line switches
post-switches = [
"-I$HOME/ldc2-1.33.0-windows-x64/import",
];
// default directories to be searched for libraries when linking
lib-dirs = [
"$HOME/ldc2-1.33.0-windows-x64/lib",
];
};
EOF
curl -LO https://github.com/ldc-developers/ldc/releases/download/v1.33.0/ldc2-1.33.0-windows-x64.7z
7z x ./ldc2-1.33.0-windows-x64.7z -o$HOME
# - name: Install dependencies
# run: sudo apt-get update && sudo apt-get install -y libz-dev elfutils clang lld 7zip
#
# - name: Set-up Windows cross-compilation
# run: |
# mkdir -p $HOME/.ldc/
# cat << EOF | tee $HOME/.ldc/ldc2.conf
# "x86_64-.*-windows-msvc":
# {
# // default switches injected before all explicit command-line switches
# switches = [
# "-defaultlib=phobos2-ldc,druntime-ldc",
# ];
# // default switches appended after all explicit command-line switches
# post-switches = [
# "-I$HOME/ldc2-1.33.0-windows-x64/import",
# ];
# // default directories to be searched for libraries when linking
# lib-dirs = [
# "$HOME/ldc2-1.33.0-windows-x64/lib",
# ];
# };
# EOF
# curl -LO https://github.com/ldc-developers/ldc/releases/download/v1.33.0/ldc2-1.33.0-windows-x64.7z
# 7z x ./ldc2-1.33.0-windows-x64.7z -o$HOME

- name: Write version file
run: echo 'module version_string; enum versionStr = "Sideloader automated build, branch ${{ github.ref_name }}, commit ${{ github.sha }}";' > source/version_string.d
Expand Down

0 comments on commit 545820a

Please sign in to comment.