Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(asdf2devbox): Switch to Java 21 #3136

Merged
merged 2 commits into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/asdf2devbox.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
pull_request:
paths:
- ".tool-versions"
- "scripts/asdf2devbox.py"
- ".github/workflows/asdf2devbox.yaml"
jobs:
asdf2devbox:
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions devbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
"yq-go": "4.44.2",
"postgresql": "latest",
"cloudfoundry-cli": "8.7.11",
"google-cloud-sdk": "latest",
"ginkgo": "2.20.0",
"temurin-bin-17": "latest",
"google-cloud-sdk": "latest",
"temurin-bin-21": "latest",
"ruby": "latest"
},
"shell": {
Expand Down
24 changes: 12 additions & 12 deletions devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1928,51 +1928,51 @@
}
}
},
"temurin-bin-17@latest": {
"last_modified": "2024-07-07T07:43:47Z",
"resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#temurin-bin-17",
"temurin-bin-21@latest": {
"last_modified": "2024-07-31T08:48:38Z",
"resolved": "github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce#temurin-bin-21",
"source": "devbox-search",
"version": "17.0.11",
"version": "21.0.3",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/2d6rfr7i5zk5w8zvfmd1r2l09pmzgz0c-temurin-bin-17.0.11",
"path": "/nix/store/an74vw8d3n04g223h5rs6nn8rv5a2pdm-temurin-bin-21.0.3",
"default": true
}
],
"store_path": "/nix/store/2d6rfr7i5zk5w8zvfmd1r2l09pmzgz0c-temurin-bin-17.0.11"
"store_path": "/nix/store/an74vw8d3n04g223h5rs6nn8rv5a2pdm-temurin-bin-21.0.3"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/xk5an6bvr31255wswn1xamx0lvsfn7pf-temurin-bin-17.0.11",
"path": "/nix/store/kn70i47biavh790xrsym6hv3qq6w1kv5-temurin-bin-21.0.3",
"default": true
}
],
"store_path": "/nix/store/xk5an6bvr31255wswn1xamx0lvsfn7pf-temurin-bin-17.0.11"
"store_path": "/nix/store/kn70i47biavh790xrsym6hv3qq6w1kv5-temurin-bin-21.0.3"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/scinqaw1rmfddmmxprnym4ccn5k94c6l-temurin-bin-17.0.11",
"path": "/nix/store/qlcv8f0dqfxmdqkd7bi1y1n1vfplbk8l-temurin-bin-21.0.3",
"default": true
}
],
"store_path": "/nix/store/scinqaw1rmfddmmxprnym4ccn5k94c6l-temurin-bin-17.0.11"
"store_path": "/nix/store/qlcv8f0dqfxmdqkd7bi1y1n1vfplbk8l-temurin-bin-21.0.3"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/8a3b40b63waavsyvdv1y822rv7lqm6kj-temurin-bin-17.0.11",
"path": "/nix/store/xnkkwdy3pgfpgh061njl2hrrq2bm0xl2-temurin-bin-21.0.3",
"default": true
}
],
"store_path": "/nix/store/8a3b40b63waavsyvdv1y822rv7lqm6kj-temurin-bin-17.0.11"
"store_path": "/nix/store/xnkkwdy3pgfpgh061njl2hrrq2bm0xl2-temurin-bin-21.0.3"
}
}
},
Expand Down
7 changes: 5 additions & 2 deletions scripts/asdf2devbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
def get_installed_version(package):
with open(os.path.join(script_dir, '..', 'devbox.json'), 'r') as f:
data = json.load(f)
return data['packages'][package]
try:
return data['packages'][package]
except KeyError:
return None

# Read the .tool-versions file and process each line
if __name__ == "__main__":
Expand All @@ -27,7 +30,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"
}
Expand Down
Loading