Merge pull request #509 from mcorino/develop

Improve CI builds

Author: mcorino

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

@@ -21,6 +21,9 @@ inputs:
     description: '1 if verifying pre-release,0 otherwise'
     required: true
     default: '0'
+  ghtoken:
+    description: 'GitHub token'
+    required: true
 
 runs:
   using: 'docker'
@@ -31,3 +34,4 @@ runs:
     - ${{ inputs.test }}
     - ${{ inputs.release }}
     - ${{ inputs.pre }}
+    - ${{ inputs.ghtoken }}

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

@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
 
-_distro=$1
+export distro=$1
 _ruby=$2
 _test=$3
 _release=$4
 _pre=$5
+_ghtok=$6
 
-./tools/scripts/docker/setup-$_distro.sh test
+./tools/scripts/docker/setup-$distro.sh test
 
 # Show some information about the system.
 uname -a
@@ -17,7 +18,7 @@ cat /etc/os-release
 if [ "$_ruby" == "system" ]; then
   # testing with system ruby
 
-  ./tools/scripts/docker/setup-$_distro-system-ruby.sh
+  ./tools/scripts/docker/setup-$distro-system-ruby.sh
 
 else
   # testing with latest ruby
@@ -32,6 +33,7 @@ if [ "$_pre" == "1" ]; then
 else
   export __WXRUBY_PRERELEASE=""
 fi
+export GITHUB_TOKEN="$_ghtok"
 
 if [ "$_test" == "1" ]; then
 

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-distro=$1
+export distro=$1
 ruby=$2
 
 ./tools/scripts/docker/setup-$distro.sh

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

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-_distro=$1
+export 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
@@ -16,7 +16,7 @@ cat /etc/os-release
 if [ "$_ruby" == "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

@@ -57,7 +57,7 @@ jobs:
             target_ruby: system
           - os: ubuntu-24.04
             arch: x86_64
-            target_distro: ubuntu
+            target_distro: linuxmint
             target_docker_image: ['linuxmintd', 'mint22.3-amd64']
             target_base: 'latest'
             target_ruby: system

.github/workflows/release.yml

@@ -448,13 +448,13 @@ jobs:
             target_ruby: 'system'
           - os: ubuntu-24.04
             arch: x86_64
-            target_distro: ubuntu
+            target_distro: linuxmint
             target_docker_image: ['linuxmintd', 'mint22.3-amd64']
             target_base: 'latest'
             target_ruby: 'system'
           - os: ubuntu-24.04
             arch: x86_64
-            target_distro: ubuntu
+            target_distro: linuxmint
             target_docker_image: ['linuxmintd', 'mint22.3-amd64']
             target_base: 'latest'
             target_ruby: 'latest'
@@ -504,6 +504,7 @@ jobs:
           test: ${{ case(github.event_name == 'workflow_dispatch', '1', '0') }}
           release: ${{ env.WXRUBY_RELEASE }}
           pre: ${{ env.WXRUBY_PRERELEASE }}
+          ghtoken: ${{ secrets.GITHUB_TOKEN }}
 
   release-docker-binpkg-prev-ver:
     needs: release-docker-binpkg
@@ -741,6 +742,7 @@ jobs:
           test: ${{ case(github.event_name == 'workflow_dispatch', '1', '0') }}
           release: ${{ env.WXRUBY_RELEASE }}
           pre: ${{ env.WXRUBY_PRERELEASE }}
+          ghtoken: ${{ secrets.GITHUB_TOKEN }}
 
   verify-gem:
     needs:

tools/scripts/docker/setup-linuxmint-system-ruby.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+if [ "$1" == "remove" ]; then
+  apt-get remove -y ruby ruby-dev
+else
+  apt-get install -y ruby ruby-dev ruby-bundler openssl libssl-dev
+fi

tools/scripts/docker/setup-linuxmint.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+apt-get update
+apt full-upgrade -y
+apt-get install -y git make gcc gpg xvfb xfonts-75dpi curl procps bzip2
+if [ "$1" == "test" ]; then
+  source /etc/os-release
+  case $VERSION_ID in
+    24.04|26.04)
+      apt-get install -y 'libgtk-3-[0-9]+' 'libwebkit2gtk-4.1-[0-9]+' 'libgspell-1-[0-9]+' libnotify4 'libsecret-1-[0-9]+' curl
+      ;;
+    *)
+      apt-get install -y 'libgtk-3-[0-9]+' 'libwebkit2gtk-4.0-[0-9]+' 'libgspell-1-[0-9]+' libnotify4 'libsecret-1-[0-9]+' curl
+      ;;
+  esac
+fi