diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index f0c9a23..93296dd 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -39,6 +39,11 @@ jobs: java-version: 21 java-package: jre + - name: setup mise + uses: jdx/mise-action@6be3c7ed4c21d4f76b208d351d95aac273ebb76d # v5.2.4 + with: + version: 2026.10.21 + - name: install savant run: | curl -O https://repository.savantbuild.org/org/savantbuild/savant-core/2.0.0/savant-2.0.0.tar.gz @@ -51,10 +56,6 @@ jobs: 21=${JAVA_HOME} EOF - # Installs the version specified in the .ruby-version file in the repo root. - - name: install ruby - uses: ruby/setup-ruby@v1 - - name: compile shell: bash -l {0} run: sb compile diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c600cd4..0acfcd4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,10 +14,14 @@ jobs: steps: - uses: actions/checkout@v6 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 + - name: setup mise + uses: jdx/mise-action@6be3c7ed4c21d4f76b208d351d95aac273ebb76d # v5.2.4 with: - bundler-cache: true + version: 2026.10.21 + + - name: bundle install + run: | + bundle install - name: Generate docs run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bde40d2..b0a9b87 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,10 +21,10 @@ jobs: working-directory: .github/fusionauth run: docker compose up -d - - name: Set up Ruby - uses: ruby/setup-ruby@v1 + - name: setup mise + uses: jdx/mise-action@6be3c7ed4c21d4f76b208d351d95aac273ebb76d # v5.2.4 with: - bundler-cache: true + version: 2026.10.21 - name: Waiting for FusionAuth App run: timeout 30 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9011)" != "200" ]]; do sleep 5; done' || false diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 25e8632..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -3.4.12 diff --git a/Gemfile.lock b/Gemfile.lock index 0fcb5c7..db295c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - fusionauth_client (1.70.0) + fusionauth_client (1.71.0) GEM remote: https://rubygems.org/ diff --git a/build.savant b/build.savant index e6f101a..1f0cb3d 100644 --- a/build.savant +++ b/build.savant @@ -1,21 +1,9 @@ /* - * Copyright (c) 2018-2024, FusionAuth, All Rights Reserved - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the License. + * Copyright (c) 2018-2026, FusionAuth, All Rights Reserved */ pubVersion = "" -project(group: "io.fusionauth", name: "fusionauth-ruby-client", version: "1.70.0", licenses: ["ApacheV2_0"]) { +project(group: "io.fusionauth", name: "fusionauth-ruby-client", version: "1.71.0", licenses: ["ApacheV2_0"]) { workflow { fetch { cache() @@ -48,7 +36,6 @@ target(name: "clean", description: "Cleans build directory") { target(name: "compile", description: "Compiles the source code") { ProcessBuilder pb = new ProcessBuilder('rake', 'build').inheritIO() - clearEnvironment(pb) if (pb.start().waitFor() != 0) { fail("Build failed") } @@ -56,7 +43,6 @@ target(name: "compile", description: "Compiles the source code") { target(name: "test", description: "Runs the project's unit tests", dependsOn: ["compile"]) { ProcessBuilder pb = new ProcessBuilder('rake', 'test').inheritIO() - clearEnvironment(pb) if (pb.start().waitFor() != 0) { fail("Tests failed") } @@ -75,7 +61,6 @@ target(name: "bundle", description: "Builds the project release bundle", depends target(name: "publish", description: "Publish the GEM file", dependsOn: ["clean", "compile"]) { ProcessBuilder pb = new ProcessBuilder('gem', 'push', "pkg/fusionauth_client-${pubVersion}.gem").inheritIO() - clearEnvironment(pb) if (pb.start().waitFor() != 0) { fail("Gem push failed") } @@ -84,14 +69,3 @@ target(name: "publish", description: "Publish the GEM file", dependsOn: ["clean" target(name: "release", description: "Releases a full version of the project", dependsOn: ["clean", "int"]) { release.release() } - -/** - * Clears out the RBENV variables in the environment. - * - * @param pb THe ProcessBuilder to clear out. - */ -private static void clearEnvironment(ProcessBuilder pb) { - pb.environment().remove("RBENV_VERSION") - pb.environment().remove("RBENV_DIR") - pb.environment().remove("RBENV_ROOT") -} diff --git a/fusionauth_client.gemspec b/fusionauth_client.gemspec index 1e3e5bd..bebbe4d 100644 --- a/fusionauth_client.gemspec +++ b/fusionauth_client.gemspec @@ -19,7 +19,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) Gem::Specification.new do |spec| spec.name = 'fusionauth_client' - spec.version = '1.70.0' + spec.version = '1.71.0' spec.authors = ['Brian Pontarelli', 'Daniel DeGroff'] spec.email = %w(brian@fusionauth.io daniel@fusionauth.io) diff --git a/mise.lock b/mise.lock new file mode 100644 index 0000000..9fbc49b --- /dev/null +++ b/mise.lock @@ -0,0 +1,50 @@ +# @generated - this file is auto-generated by `mise lock` https://mise.jdx.dev/dev-tools/mise-lock.html + +lockfile_version = 3 + +[[tools.ruby]] +version = "3.4.12" +backend = "core:ruby" +specifiers = ["3.4"] + +[tools.ruby.options] +compile = "false" +precompiled_url = "jdx/ruby" +ruby_build_repo = "https://github.com/rbenv/ruby-build.git" +ruby_install = "false" + +[tools.ruby."platforms.linux-arm64"] +checksum = "sha256:c098862e9416148e0d5c8851ce222323ef93c23d6176e12ab5c0effc06268f49" +url = "https://github.com/jdx/ruby/releases/download/3.4.12-1/ruby-3.4.12.arm64_linux.tar.gz" +provenance = "github-attestations" + +[tools.ruby."platforms.linux-arm64-musl"] +checksum = "sha256:5e5d85ad93b0adcccbad47733680f4892bd0078e3342437f7babce01c1872479" +url = "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.tar.gz" + +[tools.ruby."platforms.linux-x64"] +checksum = "sha256:12bbaa27dd857892daa21d5c57e1a48908c37b03540388474cf96974d03770d1" +url = "https://github.com/jdx/ruby/releases/download/3.4.12-1/ruby-3.4.12.x86_64_linux.tar.gz" +provenance = "github-attestations" + +[tools.ruby."platforms.linux-x64-musl"] +checksum = "sha256:5e5d85ad93b0adcccbad47733680f4892bd0078e3342437f7babce01c1872479" +url = "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.tar.gz" + +[tools.ruby."platforms.macos-arm64"] +checksum = "sha256:865b429c511c40a96fe3c25466bbf9b300e5cae22c70c7dd68e0af003b849de4" +url = "https://github.com/jdx/ruby/releases/download/3.4.12-1/ruby-3.4.12.macos.tar.gz" +provenance = "github-attestations" + +[tools.ruby."platforms.macos-x64"] +checksum = "sha256:5e5d85ad93b0adcccbad47733680f4892bd0078e3342437f7babce01c1872479" +url = "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.12.tar.gz" + +[[tools.ruby]] +version = "3.4.12" +backend = "core:ruby" +specifiers = ["3.4"] + +[tools.ruby."platforms.windows-x64"] +checksum = "sha256:3806f164377824bcb17e1cf39b17d967e2bdc01e8547ce0254cd786dbe2cfe13" +url = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.4.12-1/rubyinstaller-3.4.12-1-x64.7z" diff --git a/mise.toml b/mise.toml new file mode 100644 index 0000000..1af04b6 --- /dev/null +++ b/mise.toml @@ -0,0 +1,6 @@ +[tools] +ruby = "3.4" + +[tasks.install] +description="Installs dependencies" +run = "bundle install"