Merge CI fixes from branch 'weka-1.30' into branch-v1.30.0-weka6-bergamo

weka · May 19, 2024 · 0d32e41 · 0d32e41
2 parents ae3446c + c57210e
commit 0d32e41
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/actions/1-setup/action.yml b/.github/actions/1-setup/action.yml
@@ -18,11 +18,11 @@ runs:
         export DEBIAN_FRONTEND=noninteractive
         sudo dpkg --add-architecture i386
         sudo apt-get -q update
-        # Don't use latest gdb v10 from Ubuntu toolchain PPA with regressions, use official v8
+        # Don't use latest gdb v10+ from Ubuntu toolchain PPA with regressions, use official v9
         sudo apt-get -yq install \
           git-core cmake g++-multilib \
           libcurl4 libcurl4:i386 \
-          curl gdb=8.1.1-0ubuntu1 p7zip-full tzdata unzip zip python3-pip
+          curl gdb=9.1-0ubuntu1 p7zip-full tzdata unzip zip python3-pip
 
     - name: 'Linux: Download & extract clang' # into ../clang
       if: runner.os == 'Linux'

diff --git a/.github/actions/merge-macos/action.yml b/.github/actions/merge-macos/action.yml
@@ -104,12 +104,12 @@ runs:
         perl -0777 -pi -e "s|\\ndefault:\\n.+?\\n\\};|$sections|s" etc/ldc2.conf
         cat etc/ldc2.conf
 
-    - name: Run x86_64/arm64 macOS/iOS cross-compilation smoke tests
+    - name: Run x86_64/arm64 macOS cross-compilation smoke tests
       shell: bash
       run: |
         set -eux
         echo 'void main() { import std.stdio; writefln("Hello world, %d bits", size_t.sizeof * 8); }' > hello.d
-        for os in macos ios; do
+        for os in macos; do
           for arch in x86_64 arm64; do
             triple="$arch-apple-$os"
             ldc2-universal/bin/ldc2 -mtriple="$triple" hello.d