ci: ruby 3.3.0 in gh workflows

YOU54F · Feb 1, 2024 · b8229bc · b8229bc
1 parent e99fa57
commit b8229bc
Show file tree

Hide file tree

Showing 29 changed files with 135 additions and 91 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -1,6 +1,6 @@
 env:
   REPO: you54f/traveling-ruby
-  PKG_DATE: 20240116
+  PKG_DATE: 20240201
   NEXT_TAG: rel-$PKG_DATE
   GITHUB_TOKEN: ENCRYPTED[7f3663f35400d0e1f8e0fec456af6b75a07b0fd2d0632fe1697b8fb73af5e78245144216288d88d2daa681ccd159e07d]
 
@@ -89,27 +89,25 @@ download_task:
 
 RUBY_VERSIONS_LATEST_MATRIX: &RUBY_VERSIONS_LATEST_MATRIX
   RUBY_VERSIONS: 3.3.0
-  RUBY_VERSIONS: 3.2.2
+  RUBY_VERSIONS: 3.2.3
   RUBY_VERSIONS: 3.1.4
   RUBY_VERSIONS: 3.0.6
-  RUBY_VERSIONS: 2.7.8
-  RUBY_VERSIONS: 2.6.10
+  # RUBY_VERSIONS: 2.7.8
+  # RUBY_VERSIONS: 2.6.10
 
 RUBY_VERSIONS_MATRIX_MACOS: &RUBY_VERSIONS_MATRIX_MACOS
   RUBY_VERSIONS: 3.3.0
-  RUBY_VERSIONS: 3.2.2
+  RUBY_VERSIONS: 3.2.3
   RUBY_VERSIONS: 3.1.4
   RUBY_VERSIONS: 3.0.6
 
 RUBY_VERSIONS_MATRIX_LINUX: &RUBY_VERSIONS_MATRIX_LINUX
   RUBY_VERSIONS: 3.3.0
-  RUBY_VERSIONS: 3.2.2
+  RUBY_VERSIONS: 3.2.3
   # RUBY_VERSIONS: 2.7.8
-  RUBY_VERSIONS: 2.6.10
-  RUBY_VERSIONS: 3.1.2
-  RUBY_VERSIONS: 3.0.4
-  # 3.1.2 and 3.0.4 are not the latest, but the latest that will build
-  # for those branch on linux
+  # RUBY_VERSIONS: 2.6.10
+  RUBY_VERSIONS: 3.1.4
+  RUBY_VERSIONS: 3.0.6
 
 rake_package_and_test: &rake_package_and_test
   package_script: cd $PLATFORM && rake
@@ -275,7 +273,7 @@ set_bundler_version: &set_bundler_version
     $USE_ROSETTA rbenv global system
     $USE_ROSETTA sudo gem install bundler -v $(cat BUNDLER_VERSION.txt)
     $USE_ROSETTA bundler --version
-    $USE_ROSETTA rbenv global 3.2.2
+    $USE_ROSETTA rbenv global 3.2.3
 
 macos_check_task: 
   only_if: $CIRRUS_CHANGE_TITLE =~ 'ci\(mac-check\).*'
@@ -518,12 +516,12 @@ run_commands: &run_commands
   install_homebrew_script: *install_homebrew_script
   test_homebrew_script: *test_homebrew_script
 
-cli_arm_task:
-  arm_container:
-    image: ubuntu:22.04
-  <<: *run_commands
+# cli_arm_task:
+#   arm_container:
+#     image: ubuntu:22.04
+#   <<: *run_commands
 
-cli_amd_task:
-  container:
-    image: ubuntu:22.04
-  <<: *run_commands
+# cli_amd_task:
+#   container:
+#     image: ubuntu:22.04
+#   <<: *run_commands
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -1,7 +1,7 @@
 name: Test cli.sh
 
 on:
-  push:
+  # push:
   workflow_dispatch:
 
 jobs:
@@ -12,7 +12,7 @@ jobs:
       matrix:
         os: [macos-latest]
         shell: [bash, sh]
-        ruby-version: [3.0.6,3.1.4,3.2.2,3.3.0]
+        ruby-version: [3.0.6,3.1.4,3.2.3,3.3.0]
       fail-fast: false
     defaults:
       run:
@@ -39,7 +39,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         shell: [bash, sh]
-        ruby-version: [2.6.10,3.0.4,3.1.2,3.2.2,3.3.0]
+        ruby-version: [2.6.10,3.0.4,3.1.2,3.2.3,3.3.0]
       fail-fast: false
     defaults:
       run:
@@ -70,7 +70,7 @@ jobs:
   #   strategy:
   #     matrix:
   #       shell: [cmd, powershell, pwsh, bash, sh]
-  #       ruby-version: [2.6.10,3.0.4,3.1.2,3.2.2,3.3.0]
+  #       ruby-version: [2.6.10,3.0.4,3.1.2,3.2.3,3.3.0]
   #     fail-fast: false
   #   defaults:
   #     run:

diff --git a/.github/workflows/osx-arm64-selfhosted.yml b/.github/workflows/osx-arm64-selfhosted.yml
@@ -38,5 +38,5 @@ jobs:
       - name: 'Upload Artifact - osx arm64'
         uses: actions/upload-artifact@v3
         with:
-          name: traveling-ruby-20240116-3.3.0-osx-arm64.tar.gz
-          path: osx/traveling-ruby-20240116-3.3.0-osx-arm64.tar.gz
+          name: traveling-ruby-20240201-3.3.0-osx-arm64.tar.gz
+          path: osx/traveling-ruby-20240201-3.3.0-osx-arm64.tar.gz
diff --git a/.github/workflows/osx-arm64.yml b/.github/workflows/osx-arm64.yml
@@ -0,0 +1,44 @@
+name: MacOS arm64
+on:
+  push:
+    branches: [ main, ci, ruby-3.3  ]
+    paths-ignore:
+      - '.circleci/**'
+      - '.cirrus.yml'
+  pull_request:
+    branches: [ main, ci, ruby-3.3  ]
+    paths-ignore:
+      - '.circleci/**'
+      - '.cirrus.yml'
+
+jobs:
+  make-osx-arm64:
+    strategy:
+      matrix:
+        os: [macos-15]
+        ruby-version: [3.3.0]
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          all_but_latest: true
+      - uses: actions/checkout@v3
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+            xcode-version: '14.2'
+      - name: build arm64
+        run: |
+            cd osx
+            rake stash_conflicting_paths
+            rake --trace
+            rake unstash_conflicting_paths
+            ls
+        env:
+          DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+      - name: 'Upload Artifact- osx arm64'
+        uses: actions/upload-artifact@v3
+        with:
+          name: traveling-ruby-20240201-${{ matrix.ruby-version }}-osx-arm64.tar.gz
+          path: osx/traveling-ruby-20240201-${{ matrix.ruby-version }}-osx-arm64.tar.gz
diff --git a/.github/workflows/osx-x86_64-selfhosted.yml b/.github/workflows/osx-x86_64-selfhosted.yml
@@ -42,5 +42,5 @@ jobs:
       - name: 'Upload Artifact- osx x86_64'
         uses: actions/upload-artifact@v3
         with:
-          name: traveling-ruby-20240116-3.3.0-osx-x86_64.tar.gz
-          path: osx/traveling-ruby-20240116-3.3.0-osx-x86_64.tar.gz
+          name: traveling-ruby-20240201-3.3.0-osx-x86_64.tar.gz
+          path: osx/traveling-ruby-20240201-3.3.0-osx-x86_64.tar.gz
diff --git a/.github/workflows/osx-x86_64.yml b/.github/workflows/osx-x86_64.yml
@@ -15,7 +15,8 @@ jobs:
   make-osx-x86_64:
     strategy:
       matrix:
-        os: [macos-latest]
+        os: [macos-12]
+        ruby-version: [3.3.0]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -29,7 +30,6 @@ jobs:
             xcode-version: '14.2'
       - name: build x86
         run: |
-            # gem install bundler:2.3.17
             cd osx
             rake stash_conflicting_paths
             rake --trace
@@ -40,5 +40,5 @@ jobs:
       - name: 'Upload Artifact- osx x86_64'
         uses: actions/upload-artifact@v3
         with:
-          name: traveling-ruby-20240116-3.3.0-osx-x86_64.tar.gz
-          path: osx/traveling-ruby-20240116-3.3.0-osx-x86_64.tar.gz
+          name: traveling-ruby-20240201-${{ matrix.ruby-version }}-osx-x86_64.tar.gz
+          path: osx/traveling-ruby-20240201-${{ matrix.ruby-version }}-osx-x86_64.tar.gz
diff --git a/.github/workflows/ubuntu-arm64-image-builder.yml b/.github/workflows/ubuntu-arm64-image-builder.yml
@@ -36,9 +36,9 @@ jobs:
             docker images
         env:
           ARCHITECTURES: "arm64"
-      - name: build from image
-        run: |
-          cd linux
-          ARCHITECTURES="arm64" rake
-        env:
-          ARCHITECTURES: "arm64"
+      # - name: build from image
+      #   run: |
+      #     cd linux
+      #     ARCHITECTURES="arm64" rake
+      #   env:
+      #     ARCHITECTURES: "arm64"
diff --git a/.github/workflows/ubuntu-arm64-selfhosted.yml b/.github/workflows/ubuntu-arm64-selfhosted.yml
@@ -49,5 +49,5 @@ jobs:
       - name: 'Upload Artifact - linux arm64'
         uses: actions/upload-artifact@v3
         with:
-          name: traveling-ruby-20240116-3.3.0-linux-arm64.tar.gz
-          path: linux/traveling-ruby-20240116-3.3.0-linux-arm64.tar.gz
+          name: traveling-ruby-20240201-3.3.0-linux-arm64.tar.gz
+          path: linux/traveling-ruby-20240201-3.3.0-linux-arm64.tar.gz
diff --git a/.github/workflows/ubuntu-arm64.yml b/.github/workflows/ubuntu-arm64.yml
@@ -16,6 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        ruby-version: [3.3.0]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -27,7 +28,7 @@ jobs:
       - name: "Set up Ruby"
         uses: ruby/setup-ruby@v1
         with:
-            ruby-version: 3.3.0
+            ruby-version: ${{ matrix.ruby-version }}
       - name: package
         run: |
             docker run --privileged --rm tonistiigi/binfmt --install all
@@ -39,5 +40,5 @@ jobs:
       - name: 'Upload Artifact - linux arm64'
         uses: actions/upload-artifact@v3
         with:
-          name: traveling-ruby-20240116-3.3.0-linux-arm64.tar.gz
-          path: linux/traveling-ruby-20240116-3.3.0-linux-arm64.tar.gz
+          name: traveling-ruby-20240201-${{ matrix.ruby-version }}-linux-arm64.tar.gz
+          path: linux/traveling-ruby-20240201-${{ matrix.ruby-version }}-linux-arm64.tar.gz
diff --git a/.github/workflows/ubuntu-x86_64-image-builder.yml b/.github/workflows/ubuntu-x86_64-image-builder.yml
@@ -35,9 +35,9 @@ jobs:
           docker images
         env:
           ARCHITECTURES: "x86_64"
-      - name: build from image
-        run: |
-          cd linux
-          ARCHITECTURES="x86_64" rake
-        env:
-          ARCHITECTURES: "x86_64"
+      # - name: build from image
+      #   run: |
+      #     cd linux
+      #     ARCHITECTURES="x86_64" rake
+      #   env:
+      #     ARCHITECTURES: "x86_64"
diff --git a/.github/workflows/ubuntu-x86_64.yml b/.github/workflows/ubuntu-x86_64.yml
@@ -16,6 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        ruby-version: [3.3.0]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -27,7 +28,7 @@ jobs:
       - name: "Set up Ruby"
         uses: ruby/setup-ruby@v1
         with:
-            ruby-version: 3.3.0
+            ruby-version: ${{ matrix.ruby-version }}
       - name: package
         run: |
             cd linux
@@ -38,5 +39,5 @@ jobs:
       - name: 'Upload Artifact - linux x86_64'
         uses: actions/upload-artifact@v3
         with:
-          name: traveling-ruby-20240116-3.3.0-linux-x86_64.tar.gz
-          path: linux/traveling-ruby-20240116-3.3.0-linux-x86_64.tar.gz
+          name: traveling-ruby-20240201-${{ matrix.ruby-version }}-linux-x86_64.tar.gz
+          path: linux/traveling-ruby-20240201-${{ matrix.ruby-version }}-linux-x86_64.tar.gz
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   RB_VERSION: 3.3.0
-  PKG_DATE: 20240116
+  PKG_DATE: 20240201
 
 jobs:
   make-windows:
@@ -32,8 +32,8 @@ jobs:
           uname -m
           cd windows
           sh -c 'mkdir -p cache output/${{ env.RB_VERSION }}'
-          sh -c './build-ruby -a ${{ matrix.arch }} -r ${{ env.RB_VERSION }} cache output/${{ env.RB_VERSION }}'
-          sh -c './package -r traveling-ruby-${{ env.PKG_DATE }}-${{ env.RB_VERSION }}-${{ matrix.arch }}-windows.tar.gz output/${{ env.RB_VERSION }}'
+          sh -c './build-ruby.sh -a ${{ matrix.arch }} -r ${{ env.RB_VERSION }} cache output/${{ env.RB_VERSION }}'
+          sh -c './package.sh -r traveling-ruby-${{ env.PKG_DATE }}-${{ env.RB_VERSION }}-${{ matrix.arch }}-windows.tar.gz output/${{ env.RB_VERSION }}'
           sh -c 'ls'
       - name: 'Upload Artifact - traveling-ruby-${{ env.PKG_DATE }}-${{ env.RB_VERSION }}-${{ matrix.arch }}-windows'
         uses: actions/upload-artifact@v3

diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update && \
       apt-get clean && rm -rf /var/lib/apt/lists
 
 ARG TRAVELING_RUBY_VERSION=2.6.10
-ARG TRAVELING_RUBY_PKG_DATE=20240116
+ARG TRAVELING_RUBY_PKG_DATE=20240201
 ARG TRAVELING_RUBY_GH_SOURCE=YOU54F/traveling-ruby 
 
 ENV PATH="/home/.traveling-ruby/bin:$PATH"

diff --git a/INSTALL.md b/INSTALL.md
@@ -14,7 +14,7 @@
 curl -fsSL https://gist.githubusercontent.com/YOU54F/2e47eb0b653b6810dd6a0be9fc6820ea/raw/install.sh | sh -s -- --help
 Usage: sh [-v <version>] [-d <release-date>] [--set-path] [--clean-install] [--ci]
 
-  -v <version>          Ruby version to install (default: 3.2.2)
+  -v <version>          Ruby version to install (default: 3.2.3)
   -d <release-date>     Release date of the traveling ruby package to download (default: latest)
   --set-path            Add the traveling ruby bin path to the PATH environment variable (default: false)
   --clean-install       Remove any existing traveling ruby installation before installing (default: false)

diff --git a/README.md b/README.md
@@ -8,13 +8,13 @@ Traveling Ruby is a project which supplies self-contained, "portable" Ruby binar
 
 | OS     | Ruby      | Architecture | Supported |
 | -------| ------- | ------------ | --------- |
-| OSX    | 3.2.2     | x86_64       | ✅         |
-| OSX    | 3.2.2     | arm64| ✅         |
-| Linux  | 3.2.2   | x86_64       | ✅         |
-| Linux  | 3.2.2   | arm64 | ✅         |
-| Windows| 3.2.2 | x86_64       | ✅         |
-| Windows| 3.2.2 | x86      | ✅         |
-| Windows| 3.2.2 | arm64 | 🚧         |
+| OSX    | 3.2.3     | x86_64       | ✅         |
+| OSX    | 3.2.3     | arm64| ✅         |
+| Linux  | 3.2.3   | x86_64       | ✅         |
+| Linux  | 3.2.3   | arm64 | ✅         |
+| Windows| 3.2.3 | x86_64       | ✅         |
+| Windows| 3.2.3 | x86      | ✅         |
+| Windows| 3.2.3 | arm64 | 🚧         |
 
 🚧 - Works under emulation with x86 or x64 packages on Windows on Arm.
 
@@ -106,7 +106,7 @@ Windows support:
  * Traveling Ruby supports creating packages *for* Windows, but it does not yet support creating packages *on* Windows. That is, the Traveling Ruby tutorials and the documentation do not work when you are a Ruby developer on Windows. To create Windows packages, you must use macOS or Linux.
 
    This is because in our documentation we make heavy use of standard Unix tools. Tools which are not available on Windows. In the future we may replace the use of such tools with Ruby tools so that the documentation works on Windows too.
- * Traveling Ruby currently supports Ruby 3.2.2.
+ * Traveling Ruby currently supports Ruby 3.2.3.
  * Native extensions are not yet supported.
 
 ## Building binaries

diff --git a/RUBY_VERSIONS.txt b/RUBY_VERSIONS.txt
@@ -1,5 +1,5 @@
 3.3.0
-3.2.2
+3.2.3
 3.1.4
 3.0.6
 2.7.8

diff --git a/RUBY_VERSIONS_LATEST.txt b/RUBY_VERSIONS_LATEST.txt
@@ -1,5 +1,5 @@
 3.3.0
-3.2.2
+3.2.3
 3.1.4
 3.0.6
 2.7.8

diff --git a/RUBY_VERSIONS_LINUX.txt b/RUBY_VERSIONS_LINUX.txt
@@ -1,5 +1,5 @@
 3.3.0
-3.2.2
+3.2.3
 3.1.2
 3.0.4
 2.6.10
-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
 .3.0
-.2.2
+.2.3
 .1.4
 .0.6
 .7.8
@@ Expand Down @@