From 37be568a4a1aa780919d4eebbe48c429e1054d8b Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Thu, 7 Sep 2023 15:39:05 +1200
Subject: [PATCH] More langs

---
 .github/workflows/ci.yml | 47 ++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d72ee28e..da25385d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,18 +45,15 @@ jobs:
           # 22.04: golang-1.13 17 18 20
           apt_packages: 'golang-1.20'
           GO: go
-#    - language: node_js
-#      node_js: "node"
-#      env: NODE=node
-#    - language: rust
-#      rust:
-#        - stable
-#        - beta
-#      dist: bionic
-#      env: RUST=rust
-#    - language: csharp
-#      env: MCS=mcs
-#      dist: bionic
+        - name: javascript_node
+          NODE: node
+          apt_packages: 'nodejs'
+        - name: rust
+          RUST: rust
+          apt_packages: 'rustc'
+        - name: csharp
+          MCS: mcs
+          apt_packages: 'mono-devel'
         - name: Pascal
           FPC: fpc
           apt_packages: 'fpc'
@@ -80,9 +77,10 @@ jobs:
         - name: Ada
           gprbuild: gprbuild
           apt_packages: 'gnat gprbuild'
-#    - os: windows
-#      language: c
-#      env: c_tests=y MAKE=mingw32-make
+        - name: Windows (C)
+          os: windows-latest
+          c_tests: y
+          MAKE: mingw32-make
 #    - os: windows
 #      language: go
 #      env: GO=go MAKE=mingw32-make
@@ -124,14 +122,15 @@ jobs:
       run: |
         export CC=${{ matrix.CC || 'gcc' }}
         export MAKE=${{ matrix.MAKE || 'make' }}
+        export STEMMING_DATA=snowball-data
         $MAKE CC="$CC"
         test -z "${{ matrix.CFLAGS_DIST_BUILD }}" || { pip install setuptools && $MAKE dist && mkdir tmp && cd tmp && tar xf ../dist/libstemmer_c-*.tar.gz && cd libstemmer_c-* && $MAKE CFLAGS="${{ matrix.CFLAGS_DIST_BUILD }}" ; }
-        test -z "${{ matrix.c_tests }}" || $MAKE check CC="$CC" STEMMING_DATA=snowball-data
-        test -z "${{ matrix.PYTHON }}" || $MAKE check_python python="${{ matrix.PYTHON }}" STEMMING_DATA=snowball-data
-        test -z "${{ matrix.JAVA }}" -o -z "${{ matrix.JAVAC }}" || $MAKE check_java STEMMING_DATA=snowball-data JAVA="${{ matrix.JAVA }}" JAVAC="${{ matrix.JAVAC }}"
-        test -z "${{ matrix.MCS }}" || $MAKE check_csharp MCS="${{ matrix.MCS }}" STEMMING_DATA=snowball-data
-        test -z "${{ matrix.NODE }}" || $MAKE check_js STEMMING_DATA=snowball-data NODE="${{ matrix.NODE }}"
-        test -z "${{ matrix.RUST }}" || $MAKE check_rust STEMMING_DATA=snowball-data RUST="${{ matrix.RUST }}"
-        test -z "${{ matrix.GO }}" || $MAKE check_go STEMMING_DATA=snowball-data GO="${{ matrix.GO }}"
-        test -z "${{ matrix.FPC }}" || $MAKE check_pascal STEMMING_DATA=snowball-data FPC="${{ matrix.FPC }}"
-        test -z "${{ matrix.gprbuild }}" || $MAKE check_ada STEMMING_DATA=snowball-data gprbuild="${{ matrix.gprbuild }}"
+        test -z "${{ matrix.c_tests }}" || $MAKE check CC="$CC"
+        test -z "${{ matrix.PYTHON }}" || $MAKE check_python python="${{ matrix.PYTHON }}"
+        test -z "${{ matrix.JAVA }}" -o -z "${{ matrix.JAVAC }}" || $MAKE check_java JAVA="${{ matrix.JAVA }}" JAVAC="${{ matrix.JAVAC }}"
+        test -z "${{ matrix.MCS }}" || $MAKE check_csharp MCS="${{ matrix.MCS }}"
+        test -z "${{ matrix.NODE }}" || $MAKE check_js NODE="${{ matrix.NODE }}"
+        test -z "${{ matrix.RUST }}" || $MAKE check_rust RUST="${{ matrix.RUST }}"
+        test -z "${{ matrix.GO }}" || $MAKE check_go GO="${{ matrix.GO }}"
+        test -z "${{ matrix.FPC }}" || $MAKE check_pascal FPC="${{ matrix.FPC }}"
+        test -z "${{ matrix.gprbuild }}" || $MAKE check_ada gprbuild="${{ matrix.gprbuild }}"