From c22d5983c7082c1c67f73be99537fc9192816260 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Fri, 16 Aug 2024 14:25:02 +0200 Subject: [PATCH] chore(asdf2devbox): Switch to Java 21 # Issue As the Nix package name contains the Java major version, the translation needs to be updated now that we have switched to version 21 # Fix Just a static string change. Parsing it from the version number would be possible, but as it is a LTS release the next update should be in the far future. --- .github/workflows/asdf2devbox.yaml | 2 ++ devbox.json | 1 - devbox.lock | 49 +----------------------------- scripts/asdf2devbox.py | 2 +- 4 files changed, 4 insertions(+), 50 deletions(-) diff --git a/.github/workflows/asdf2devbox.yaml b/.github/workflows/asdf2devbox.yaml index 15162d7f88..cf71577847 100644 --- a/.github/workflows/asdf2devbox.yaml +++ b/.github/workflows/asdf2devbox.yaml @@ -4,6 +4,8 @@ on: pull_request: paths: - ".tool-versions" + - "scripts/asdf2devbox.py" + - ".github/workflows/asdf2devbox.yaml" jobs: asdf2devbox: runs-on: ubuntu-latest diff --git a/devbox.json b/devbox.json index 85c5e0e6de..1a543f759f 100644 --- a/devbox.json +++ b/devbox.json @@ -39,7 +39,6 @@ "cloudfoundry-cli": "8.7.11", "google-cloud-sdk": "latest", "ginkgo": "2.20.0", - "temurin-bin-17": "latest", "ruby": "latest" }, "shell": { diff --git a/devbox.lock b/devbox.lock index 4d6ccce6c3..a8bb2aca0c 100644 --- a/devbox.lock +++ b/devbox.lock @@ -1666,6 +1666,7 @@ }, "ruby@latest": { "last_modified": "2024-07-31T08:48:38Z", + "plugin_version": "0.0.2", "resolved": "github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce#ruby_3_3", "source": "devbox-search", "version": "3.3.4", @@ -1928,54 +1929,6 @@ } } }, - "temurin-bin-17@latest": { - "last_modified": "2024-07-07T07:43:47Z", - "resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#temurin-bin-17", - "source": "devbox-search", - "version": "17.0.11", - "systems": { - "aarch64-darwin": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/2d6rfr7i5zk5w8zvfmd1r2l09pmzgz0c-temurin-bin-17.0.11", - "default": true - } - ], - "store_path": "/nix/store/2d6rfr7i5zk5w8zvfmd1r2l09pmzgz0c-temurin-bin-17.0.11" - }, - "aarch64-linux": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/xk5an6bvr31255wswn1xamx0lvsfn7pf-temurin-bin-17.0.11", - "default": true - } - ], - "store_path": "/nix/store/xk5an6bvr31255wswn1xamx0lvsfn7pf-temurin-bin-17.0.11" - }, - "x86_64-darwin": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/scinqaw1rmfddmmxprnym4ccn5k94c6l-temurin-bin-17.0.11", - "default": true - } - ], - "store_path": "/nix/store/scinqaw1rmfddmmxprnym4ccn5k94c6l-temurin-bin-17.0.11" - }, - "x86_64-linux": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/8a3b40b63waavsyvdv1y822rv7lqm6kj-temurin-bin-17.0.11", - "default": true - } - ], - "store_path": "/nix/store/8a3b40b63waavsyvdv1y822rv7lqm6kj-temurin-bin-17.0.11" - } - } - }, "which@latest": { "last_modified": "2024-07-07T07:43:47Z", "resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#which", diff --git a/scripts/asdf2devbox.py b/scripts/asdf2devbox.py index 49759d6eb6..2d9da2f8a1 100755 --- a/scripts/asdf2devbox.py +++ b/scripts/asdf2devbox.py @@ -27,7 +27,7 @@ def get_installed_version(package): "credhub": "credhub-cli", "gcloud": "google-cloud-sdk", "golang": "go", - "java": "temurin-bin-17", + "java": "temurin-bin-21", "make": "gnumake", "yq": "yq-go" }