Skip to content

Commit 30a9c84

Browse files
authored
Merge pull request #719 from kinke/fix_ci
[stable] Fix CI incl. nightly DMD builds
2 parents 3173e6d + a8c50fb commit 30a9c84

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/workflows/build_release_template.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
fail-fast: false
125125
matrix:
126126
include:
127-
- os: ubuntu-20.04
127+
- os: ubuntu-22.04
128128
target: linux
129129
- os: macos-13
130130
target: osx
@@ -271,7 +271,7 @@ jobs:
271271
run: |
272272
set -eux
273273
274-
sudo pkg install -y curl curlpp git gmake pkgconf gnupg rsync llvm
274+
sudo pkg install -y curl curlpp git gmake pkgconf gnupg rsync llvm15
275275
276276
# Import key used to sign binaries
277277
curl -fsS https://dlang.org/d-keyring.gpg -o d-keyring.gpg

create_dmd_release/common.d

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ string mkdtemp()
9696
// templated so that we don't drag in libcurl unnecessarily
9797
template fetchFile()
9898
{
99-
pragma(lib, "curl");
100-
10199
void fetchFile(string url, string path, bool verify = false, string sha = null)
102100
{
103101
import std.array, std.datetime, std.exception, std.net.curl,

test/release/validate_release.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,11 @@ done
6161

6262
for DUB in $GEN/dmd2/$OS/bin*/dub$EXE
6363
do
64-
$DUB run -n --arch=x86_64 --single $DIR/dub_example.d
65-
rm -rf $DIR/.dub $DIR/dub_example$EXE
64+
# FIXME: https://github.com/dlang/dub/issues/3030
65+
if [ "$OS" != "windows" ]; then
66+
$DUB run -n --arch=x86_64 --single $DIR/dub_example.d
67+
rm -rf $DIR/.dub $DIR/dub_example$EXE
68+
fi
6669
done
6770

6871
###############################################################################

0 commit comments

Comments
 (0)