[gh actions] perl5 for bsd, fix double solaris

git-svn-id: svn://tug.org/texlive/trunk/Build/source@69558 c570f23f-e606-0410-a88d-b1316a301751
TeX-Live · Jan 23, 2024 · 7354387 · 7354387
1 parent 3a8fc93
commit 7354387
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/.github/scripts/build-tl.sh b/.github/scripts/build-tl.sh
@@ -43,10 +43,10 @@ then
        apk add --no-progress bash gcc g++ make perl fontconfig-dev libx11-dev libxmu-dev libxaw-dev
        ;;
      freebsd)
-       env ASSUME_ALWAYS_YES=YES pkg install -y gmake gcc pkgconf libX11 libXt libXaw fontconfig perl
+       env ASSUME_ALWAYS_YES=YES pkg install -y gmake gcc pkgconf libX11 libXt libXaw fontconfig perl5
        ;;
      netbsd)
-       pkg_add gmake gcc pkgconf libX11 libXt libXaw fontconfig perl
+       pkg_add gmake gcc pkgconf libX11 libXt libXaw fontconfig perl5
        ;;
      solaris)
        echo "Solaris support is WIP, please help!" >&2

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -135,13 +135,6 @@ jobs:
         ci_build: [ true ]
         release_build: 
           - ${{ startsWith(github.ref, 'refs/tags/') }}
-        include:
-          - os: solaris
-            ci_build: false
-            arch: i386
-          - os: solaris
-            ci_build: false
-            arch: amd64
 
     steps:
       - name: checkout-main
@@ -168,7 +161,7 @@ jobs:
             sh .github/scripts/build-tl.sh ${{ matrix.arch }}-${{ matrix.os }} ${{ matrix.os }}
       - name: build solaris
         uses: vmactions/solaris-vm@v1
-        if: ${{ matrix.os == 'solaris' && (matrix.ci_build || matrix.release_build) }}
+        if: ${{ false && matrix.os == 'solaris' && (matrix.ci_build || matrix.release_build) }}
         with: 
           usesh: true
           run: |