CI: Drop autotools based os_x job

See RM #905 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
cazfi · Sep 22, 2024 · e5fe115 · e5fe115
1 parent 09c216a
commit e5fe115
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 80 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,46 +48,6 @@ jobs:
         run: |
           cd windows/installer_msys2
           make -f Makefile.meson ci
-  os_x:
-    runs-on: macos-13
-    steps:
-      - name: check out Freeciv
-        uses: actions/checkout@v4.1.1
-      - name: install dependencies
-        run: |
-          # Remove symlinks of the old python version
-          rm /usr/local/bin/2to3*
-          rm /usr/local/bin/idle3*
-          rm /usr/local/bin/pydoc3*
-          rm /usr/local/bin/python3*
-          brew install \
-            llvm \
-            lua@5.4 \
-            autoconf \
-            automake \
-            gettext \
-            libtool \
-            pkg-config \
-            atk \
-            freetype \
-            gettext \
-            glib \
-            jpeg \
-            gtk+3 \
-            gtk4 \
-            icu4c \
-            pango \
-            sdl2_gfx \
-            sdl2_image \
-            sdl2_mixer \
-            sdl2_ttf \
-            qt@6 \
-            mysql-client \
-            postgresql \
-            unixodbc
-      - name: build
-        shell: bash
-        run: ./scripts/ci-build.sh os_x
   mac-meson:
     runs-on: macos-14
     steps:

diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
@@ -68,46 +68,6 @@ ninja
 ninja install
 ;;
 
-"os_x")
-# gcc is an alias for clang on OS X
-
-MSQLPFX="$(brew --prefix mysql-client)"
-OSSL_PFX="$(brew --prefix openssl)"
-
-export PATH="$(brew --prefix llvm)/bin:$(brew --prefix gettext)/bin:$(brew --prefix icu4c)/bin:$(brew --prefix qt@6)/bin:${MSQLPFX}/bin:${PATH}"
-export CPPFLAGS="-I$(brew --prefix gettext)/include -I$(brew --prefix icu4c)/include -I$(brew --prefix qt@6)/include -I$(brew --prefix readline)/include -I$(brew --prefix unixodbc)/include -I${MSQLPFX}/include -I${OSSL_PFX}/include"
-export LDFLAGS="-L$(brew --prefix gettext)/lib -L$(brew --prefix icu4c)/lib -L$(brew --prefix qt@6)/lib -L$(brew --prefix readline)/lib -L$(brew --prefix unixodbc)/lib -L${MSQLPFX}/lib -L${OSSL_PFX}/lib"
-export PKG_CONFIG_PATH="$(brew --prefix icu4c)/lib/pkgconfig"
-
-export MOCCMD=$(find /usr/local/Cellar/qt -name "moc" | head -n 1)
-
-mkdir build
-cd build
-../autogen.sh --no-configure-run
-../configure \
- CC="clang" CXX="clang++" \
- --enable-debug \
- --enable-sys-lua --with-qtver=qt6 \
- --enable-client=gtk3.22,sdl2,qt,gtk4 \
- --enable-fcmp=gtk3,gtk4,qt,cli \
- --enable-fcdb=sqlite3,mysql,postgres,odbc \
- --enable-freeciv-manual \
- --with-followtag="macos" \
- --prefix=${HOME}/freeciv/mac-at \
- || (let config_exit_status=$? \
-     && echo "Config exit status: $config_exit_status" \
-     && cat config.log \
-     && exit $config_exit_status)
-make -j$(sysctl -n hw.logicalcpu)
-make install
-
-echo "Running Freeciv server autogame"
-cd ${HOME}/freeciv/mac-at/bin/
-./freeciv-server --Announce none -e -F --read ${basedir}/scripts/test-autogame.serv
-
-echo "Freeciv server autogame successful!"
-;;
-
 "mac-meson")
 
 GETTEXT_PREFIX="$(brew --prefix gettext)"