Develop

.github/actions/linux-docker-release-verify/action.yml

@@ -0,0 +1,33 @@
+name: docker-release-verify
+author: martin
+description: 'Linux release builds using docker'
+inputs:
+  distro:  # id of input
+    description: 'What distribution docker image to use'
+    required: true
+    default: 'ubuntu'
+  ruby:
+    description: 'What ruby version to use: system or latest'
+    required: true
+    default: 'latest'
+  test:
+    description: '1 if testing release workflow, 0 if actually releasing'
+    required: true
+    default: '1'
+  release:
+    description: 'Release version'
+    required: true
+  pre:
+    description: '1 if verifying pre-release,0 otherwise'
+    required: true
+    default: '0'
+
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  args:
+    - ${{ inputs.distro }}
+    - ${{ inputs.ruby }}
+    - ${{ inputs.test }}
+    - ${{ inputs.release }}
+    - ${{ inputs.pre }}

.github/actions/linux-docker-release-verify/entrypoint.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+_distro=$1
+_ruby=$2
+_test=$3
+_release=$4
+_pre=$5
+
+./tools/scripts/docker/setup-$_distro.sh test
+
+# Show some information about the system.
+uname -a
+locale
+locale -a
+cat /etc/os-release
+
+if [ "$_ruby" == "system" ]; then
+  # testing with system ruby
+
+  ./tools/scripts/docker/setup-$_distro-system-ruby.sh
+
+else
+  # testing with latest ruby
+
+  ./tools/scripts/docker/setup-ruby-install-latest.sh
+
+fi
+
+export __WXRUBY_RELEASE_VERSION=$_release
+if [ "$_pre" == "1" ]; then
+  export __WXRUBY_PRERELEASE="--pre"
+else
+  export __WXRUBY_PRERELEASE=""
+fi
+
+if [ "$_test" == "1" ]; then
+
+  ./tools/scripts/docker/test-wxruby3-release.sh --test
+
+else
+
+  ./tools/scripts/docker/test-wxruby3-release.sh
+
+fi

.github/actions/linux-docker-release/action.yml

@@ -0,0 +1,18 @@
+name: docker-release
+author: martin
+description: 'Linux release builds using docker'
+inputs:
+  distro:  # id of input
+    description: 'What distribution docker image to use'
+    required: true
+    default: 'ubuntu'
+  ruby:
+    description: 'What ruby version to use: system or latest'
+    required: false
+    default: 'latest'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  args:
+    - ${{ inputs.distro }}
+    - ${{ inputs.ruby }}

.github/actions/linux-docker-release/entrypoint.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+distro=$1
+ruby=$2
+
+./tools/scripts/docker/setup-$distro.sh
+
+# Show some information about the system.
+uname -a
+locale
+locale -a
+cat /etc/os-release
+
+if [ "$ruby" == "system" ]; then
+  # testing with system ruby
+
+  ./tools/scripts/docker/setup-$distro-system-ruby.sh
+
+  ./tools/scripts/docker/build-wxruby3.sh --binpkg 2>&1 | tee -a build-wxruby3.log
+
+else
+  # testing with latest ruby
+
+  ./tools/scripts/docker/setup-ruby-install-latest.sh
+
+  ./tools/scripts/docker/build-wxruby3.sh --latest --binpkg 2>&1 | tee -a build-wxruby3.log
+fi

.github/actions/linux-docker-verify/entrypoint.sh

@@ -1,22 +1,22 @@
 #!/usr/bin/env bash
 
-distro=$1
-ruby=$2
+_distro=$1
+_ruby=$2
 
 export WXRUBY_TEST_EXCLUDE='test_intl:test_media_ctrl'
 
-./tools/scripts/docker/setup-$distro.sh test
+./tools/scripts/docker/setup-$_distro.sh test
 
 # Show some information about the system.
 uname -a
 locale
 locale -a
 cat /etc/os-release
 
-if [ "$ruby" -eq "system" ]; then
+if [ "$_ruby" -eq "system" ]; then
   # testing with system ruby
 
-  ./tools/scripts/docker/setup-$distro-system-ruby.sh
+  ./tools/scripts/docker/setup-$_distro-system-ruby.sh
 
   ./tools/scripts/docker/build-wxruby3.sh 2>&1 | tee -a build-wxruby3.log
 

.github/workflows/docker.yml

@@ -47,37 +47,40 @@ jobs:
           - os: ubuntu-24.04
             arch: x86_64
             target_distro: fedora
-            target_base: fedora:latest
+            target_base: 'latest'
             target_ruby: system
           - os: ubuntu-24.04
             arch: x86_64
             target_distro: opensuse
-            target_base: 'opensuse/leap:latest'
+            target_docker_image: ['opensuse', 'leap']
+            target_base: 'latest'
             target_ruby: system
           - os: ubuntu-24.04
             arch: x86_64
             target_distro: ubuntu
-            target_base: 'linuxmintd/mint22-amd64'
+            target_docker_image: ['linuxmintd', 'mint22.3-amd64']
+            target_base: 'latest'
             target_ruby: system
           - os: ubuntu-24.04-arm
             arch: arm64
             target_distro: debian
-            target_base: debian:12
+            target_base: '12'
             target_ruby: system
           - os: ubuntu-24.04
             arch: x86_64
             target_distro: arch
-            target_base: 'archlinux/archlinux:latest'
+            target_docker_image: ['archlinux', 'archlinux']
+            target_base: 'latest'
             target_ruby: latest
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.target_base }} ${{ matrix.arch }} ruby=${{ matrix.target_ruby }}
+    name: ${{ case(matrix.target_docker_image != '', join(matrix.target_docker_image, '/'), matrix.target_distro) }}:${{ matrix.target_base }} ${{ matrix.arch }} ruby=${{ matrix.target_ruby }}
     steps:
     - name: Checkout wxRuby3
       uses: actions/checkout@v6
 
     - name: Setup Dockerfile
       run: |
-        ${{ github.workspace }}/tools/scripts/docker/create-docker-file.sh ${{ matrix.target_base }} ${{ github.workspace }}/.github/actions/linux-docker-verify/Dockerfile
+        ${{ github.workspace }}/tools/scripts/docker/create-docker-file.sh ${{ case(matrix.target_docker_image != '', join(matrix.target_docker_image, '/'), matrix.target_distro) }} ${{ matrix.target_base }} ${{ github.workspace }}/.github/actions/linux-docker-verify/Dockerfile
 
     - name: Verify wxRuby3 on docker image
       uses: ./.github/actions/linux-docker-verify
@@ -95,32 +98,34 @@ jobs:
           - os: ubuntu-24.04
             arch: x86_64
             target_distro: manjaro
-            target_base: 'manjarolinux/base:latest'
+            target_docker_image: ['manjarolinux', 'base']
+            target_base: 'latest'
             target_ruby: system
           - os: ubuntu-24.04
             arch: x86_64
             target_distro: debian
-            target_base: debian:latest
+            target_base: 'latest'
             target_ruby: latest
           - os: ubuntu-24.04-arm
             arch: arm64
             target_distro: fedora
-            target_base: fedora:42
+            target_base: '42'
             target_ruby: latest
           - os: ubuntu-24.04-arm
             arch: arm64
             target_distro: opensuse
-            target_base: 'opensuse/leap:15.6'
+            target_docker_image: ['opensuse', 'leap']
+            target_base: '15.6'
             target_ruby: latest
     runs-on: ${{ matrix.os }}
-    name: ${{ matrix.target_base }} ${{ matrix.arch }} ruby=${{ matrix.target_ruby }}
+    name: ${{ case(matrix.target_docker_image != '', join(matrix.target_docker_image, '/'), matrix.target_distro) }}:${{ matrix.target_base }} ${{ matrix.arch }} ruby=${{ matrix.target_ruby }}
     steps:
       - name: Checkout wxRuby3
         uses: actions/checkout@v6
 
       - name: Setup Dockerfile
         run: |
-          ${{ github.workspace }}/tools/scripts/docker/create-docker-file.sh ${{ matrix.target_base }} ${{ github.workspace }}/.github/actions/linux-docker-verify/Dockerfile
+          ${{ github.workspace }}/tools/scripts/docker/create-docker-file.sh ${{ case(matrix.target_docker_image != '', join(matrix.target_docker_image, '/'), matrix.target_distro) }} ${{ matrix.target_base }} ${{ github.workspace }}/.github/actions/linux-docker-verify/Dockerfile
 
       - name: Verify wxRuby3 on docker image
         uses: ./.github/actions/linux-docker-verify