feat: switch to another GitHub action and set version of FreeBSD to 14.0

thindil · Jan 4, 2024 · f6f8781 · f6f8781
1 parent 5a49973
commit f6f8781
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 29 deletions.
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
@@ -17,53 +17,48 @@ on:
         required: true
         default: "7.4"
         type: string
-run-name: Build wine-${{ inputs.winetype }} ${{ inputs.wineversion }} for FreeBSD 13.2
+run-name: Build wine-${{ inputs.winetype }} ${{ inputs.wineversion }} for FreeBSD 14.0
 
 jobs:
   freebsd64:
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     timeout-minutes: 80
     steps:
     - uses: actions/checkout@v3
     - name: Build Wine for FreeBSD 64-bit
-      uses: cross-platform-actions/action@v0.21.1
+      uses: vmactions/freebsd-vm@v1
       with:
-        shell: sh
-        operating_system: freebsd
-        architecture: x86-64
-        version: '13.2'
+        usesh: true
+        prepare: |
+          sed -i '' -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
+          pkg install -y git nim ca_root_nss
         run: |
-          sudo sed -i '' -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
-          sudo pkg install -y git nim
-          sudo git clone https://github.com/freebsd/freebsd-ports.git /usr/ports
-          sudo /usr/local/nim/bin/nim --hints:off build.nims ${{ inputs.wineversion }} ${{ inputs.winetype }}
+          git clone https://github.com/freebsd/freebsd-ports.git /usr/ports
+          /usr/local/nim/bin/nim --hints:off build.nims ${{ inputs.wineversion }} ${{ inputs.winetype }}
 
     - name: Release
       uses: softprops/action-gh-release@v1
       with:
-        name: '13.2-amd64'
-        tag_name: '13.2-amd64'
+        name: '14.0-amd64'
+        tag_name: '14.0-amd64'
         files: '*.pkg'
 
   freebsd32:
     needs: freebsd64
-    runs-on: macos-12
+    runs-on: ubuntu-latest
     timeout-minutes: 80
     steps:
     - uses: actions/checkout@v3
     - name: Build Wine for FreeBSD 32-bit
-      uses: cross-platform-actions/action@v0.21.1
+      uses: vmactions/freebsd-vm@v1
       with:
-        shell: sh
-        operating_system: freebsd
-        architecture: x86-64
-        version: '13.2'
+        usesh: true
         run: |
-          sudo sh ./32bit.sh ${{ inputs.wineversion }} ${{ inputs.winetype }}
+          sh ./32bit.sh ${{ inputs.wineversion }} ${{ inputs.winetype }}
 
     - name: Release
       uses: softprops/action-gh-release@v1
       with:
-        name: '13.2-i386'
-        tag_name: '13.2-i386'
+        name: '14.0-i386'
+        tag_name: '14.0-i386'
         files: '*.pkg'
diff --git a/32bit.sh b/32bit.sh
@@ -2,19 +2,19 @@ mkdir -p /usr/jails/freebsd32
 cp build.nims /usr/jails/freebsd32/
 cp -R patches /usr/jails/freebsd32/
 cp -R new /usr/jails/freebsd32/
-cd /usr/jails/freebsd32
-fetch ftp://ftp2.de.freebsd.org/pub/FreeBSD/releases/i386/i386/13.2-RELEASE/base.txz
+cd /usr/jails/freebsd32 || exit
+fetch ftp://ftp2.de.freebsd.org/pub/FreeBSD/releases/i386/i386/14.0-RELEASE/base.txz
 tar xf base.txz
 rm -rf boot
 rm base.txz
 cp /etc/resolv.conf /usr/jails/freebsd32/etc/
 sed -i '' -e 's/quarterly/latest/g' /usr/jails/freebsd32/etc/pkg/FreeBSD.conf
-jail -c -f /Users/runner/work/wine-freesbie/wine-freesbie/jail.conf freebsd32
-jexec freebsd32 pkg install -y git nim
+jail -c -f /root/work/wine-freesbie/wine-freesbie/jail.conf freebsd32
+jexec freebsd32 pkg install -y git nim ca_root_nss
 jexec freebsd32 git clone https://github.com/freebsd/freebsd-ports.git /usr/ports
 jexec freebsd32 touch output.txt
 jexec freebsd32 /usr/local/nim/bin/nim --hints:off build.nims "$1" "$2"
 jexec freebsd32 cp output.txt /
 jexec freebsd32 cp work/pkg/*.pkg /
-cp /usr/jails/freebsd32/output.txt /Users/runner/work/wine-freesbie/wine-freesbie/
-cp /usr/jails/freebsd32/*.pkg /Users/runner/work/wine-freesbie/wine-freesbie/
+cp /usr/jails/freebsd32/output.txt /root/work/wine-freesbie/wine-freesbie/
+cp /usr/jails/freebsd32/*.pkg /root/work/wine-freesbie/wine-freesbie/
diff --git a/jail.conf b/jail.conf
@@ -5,7 +5,7 @@ path = /usr/jails/$name;
 allow.mount;
 allow.mount.devfs;
 persist;
-mount.fstab = /Users/runner/work/wine-freesbie/wine-freesbie/fstab.$name;
+mount.fstab = /root/work/wine-freesbie/wine-freesbie/fstab.$name;
 
 freebsd32 {
 	mount.procfs;