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

Update golang version to 1.23.1 #3518

Closed
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
4 changes: 4 additions & 0 deletions .final_builds/packages/golang-1-linux/index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,8 @@ builds:
version: da6d4c66ebbf23ea0f9bf496e44b9f1f21cae9afa18842617d5b4b257cdfcfbb
blobstore_id: 8608be79-d102-4dd7-65f6-279f7bec2063
sha1: sha256:26349b5c41a78e83c91db4a54b50de48118ec36428bb5cba0b5994903edfc861
f46b6d3e8b659ee6bc5324ead33bc8e0b19a78e65afbfe2573828b55aa0def66:
version: f46b6d3e8b659ee6bc5324ead33bc8e0b19a78e65afbfe2573828b55aa0def66
blobstore_id: 8b7a1f69-f6e6-4273-6a51-a03207a9a0df
sha1: sha256:494d56e65e80c0a03603210888c0d88a448ac43960891c7320746e1b83527fda
format-version: "2"
92 changes: 0 additions & 92 deletions .github/workflows/asdf2devbox.yaml

This file was deleted.

16 changes: 7 additions & 9 deletions .github/workflows/bosh-templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,18 @@ jobs:
templates:
name: Bosh Templates Test
runs-on: ubuntu-latest
container:
image: ghcr.io/cloudfoundry/app-autoscaler-release-tools:main@sha256:5277733db60d4e659404ad330e7c0da790cb65c18b41cf0b2ca6e424294c5dd9
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
env:
# Needed for self-hosted runner
ImageOS: "ubuntu22"
- name: Install devbox
uses: jetify-com/devbox-install-action@734088efddca47cf44ff8a09289c6d0e51b73218 # v0.12.0
with:
# runs 'bundle install' and caches installed gems automatically
bundler-cache: true
enable-cache: 'true'
- name: Make devbox shellenv available
run: |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 [actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2086:info:2:13: Double quote to prevent globbing and word splitting [shellcheck]

eval "$(devbox shellenv)"
printenv >> $GITHUB_ENV

- name: Run Tests
run: |
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ on:
paths:
- 'ci/dockerfiles/**'
- '.github/workflows/image.yml'
- '.tool-versions'
pull_request:
paths:
- 'ci/dockerfiles/**'
- '.github/workflows/image.yml'
- '.tool-versions'
workflow_dispatch:

env:
Expand All @@ -20,6 +18,7 @@ env:
jobs:
build-and-push-image:
runs-on: ubuntu-latest
container: jetpackio/devbox:latest@sha256:3e9b26747056d019dcedf295604a9b42dfe5a3b326fcc76de712b54a674314bd
permissions:
contents: read
packages: write
Expand Down Expand Up @@ -50,15 +49,15 @@ jobs:
- name: Get ginkgo version from autoscaler-release
id: ginkgo
run: |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 [actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2028:info:2:6: echo may not expand escape sequences. Use printf [shellcheck]

version=$(grep "ginkgo " .tool-versions| cut -f 2 -d " ")
echo "GINKGO version from .tool-versions: \'${version}\'"
version=$(devbox info ginkgo | head --lines=1 | cut --field=2 --delimiter=" ")
echo "GINKGO version from devbox: \'${version}\'"
echo "version=${version}" >> "$GITHUB_OUTPUT"

- id: get-golang-version
shell: bash
run: |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 [actionlint] reported by reviewdog 🐶
shellcheck reported issue in this script: SC2028:info:2:6: echo may not expand escape sequences. Use printf [shellcheck]

version=$(grep "golang " .tool-versions| cut -f 2 -d " ")
echo "Go version from .tool-versions: \'${version}\'"
version=$(devbox info go | head --lines=1 | cut --field=2 --delimiter=" ")
echo "Go version from devbox: \'${version}\'"
echo "version=${version}" >> "$GITHUB_OUTPUT"

- name: Build and push
Expand Down
17 changes: 0 additions & 17 deletions .tool-versions

This file was deleted.

4 changes: 2 additions & 2 deletions ci/autoscaler/tasks/update-sdk/go_task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ platform: linux
image_resource:
type: registry-image
source:
repository: ghcr.io/cloudfoundry/app-autoscaler-release-tools
tag: main
repository: jetpackio/devbox-root-user
tag: latest

inputs:
- name: app-autoscaler-release
Expand Down
2 changes: 1 addition & 1 deletion ci/autoscaler/tasks/update-sdk/java_task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform: linux
image_resource:
type: registry-image
source:
repository: ghcr.io/cloudfoundry/app-autoscaler-release-tools
repository: jetpackio/devbox-root-user
tag: main

inputs:
Expand Down
4 changes: 2 additions & 2 deletions ci/autoscaler/tasks/update-sdk/update_golang_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ golang_version=$(cat "${golang_dir}/packages/golang-1-linux/version")
step "updating go.mod files with golang version ${golang_version}"
find "${autoscaler_dir}" -name go.mod -type f -exec go mod edit -go "${golang_version}" "{}" \;

step "updating .tool-versions file with golang version ${golang_version}"
sed -i "s/golang 1.*/golang ${golang_version}/g" "${autoscaler_dir}/.tool-versions"
step "updating devbox with golang version ${golang_version}"
devbox add --config "${autoscaler_dir}" "go@${golang_version}"

echo -n "${golang_version}" > "${autoscaler_dir}/version"
vendor-package "${golang_dir}" golang-1-linux "${golang_version}"
Expand Down
4 changes: 2 additions & 2 deletions ci/autoscaler/tasks/update-sdk/update_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ source "${script_dir}/vars.source.sh"
create_pr=${CREATE_PR:-"false"}

# shellcheck disable=SC2154
"${script_dir}"/update_"${type}"_package.sh
[[ ${create_pr} == "true" ]] && "${script_dir}"/create_pr.sh
devbox run --config app-autoscaler-release -- "cd ..; ${script_dir}/update_${type}_package.sh"
[[ ${create_pr} == "true" ]] && devbox run --config app-autoscaler-release -- "cd ..; ${script_dir}/create_pr.sh"
6 changes: 1 addition & 5 deletions ci/terragrunt/.envrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@ if command -v nix &> /dev/null
then
echo 'direnv: using nix-flakes'
use flake
elif command -v asdf &> /dev/null
then
echo 'direnv: using asdf'
use asdf
fi
fi
6 changes: 0 additions & 6 deletions ci/terragrunt/.tool-versions

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module apitester

go 1.23.0
go 1.23.1
6 changes: 3 additions & 3 deletions devbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
"direnv": "2.35.0",
"yq-go": "4.44.5",
"golangci-lint": "1.62.2",
"fly": "7.10.0",
"ruby": "3.3.6",
"go": "1.23.0",
"redocly": "latest",
"google-java-format": "latest",
"actionlint": "1.7.7",
"ginkgo": "2.22.2",
"act": "0.2.72",
"cloudfoundry-cli": "8.8.1",
"temurin-bin-21": "latest"
"temurin-bin-21": "latest",
"fly": "7.12.0",
"go": "1.23.1"
},
"shell": {
"init_hook": [
Expand Down
Loading
Loading