Merge branch 'ubuntu-jammy' into merge-jammy

Author: aramprice

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_CACHE_ALL: "false"

.gitattributes

@@ -0,0 +1 @@
+/vendor/cache/*.gem filter=lfs diff=lfs merge=lfs -text

.github/dependabot.yml

@@ -0,0 +1,7 @@
+---
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/go.yml

@@ -6,11 +6,11 @@ jobs:
   dry-run-acceptance-tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
+    - uses: actions/checkout@v6
+    - uses: actions/setup-go@v6
       with:
         go-version-file: acceptance-tests/go.mod
-    - uses: golangci/golangci-lint-action@v6
+    - uses: golangci/golangci-lint-action@v9
       with:
         working-directory: acceptance-tests
     - name: Dry Run acceptance-tests

.github/workflows/ruby.yml

@@ -0,0 +1,15 @@
+name: Run Specs
+on: [ push, pull_request ]
+
+jobs:
+  unit_specs:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+      with: { lfs: true }
+    - uses: ruby/setup-ruby@v1
+    - name: test-bosh-stemcell
+      run: |
+        bundle install
+        bundle exec rspec
+      working-directory: bosh-stemcell/

.github/workflows/sbom.yml

@@ -55,16 +55,16 @@ jobs:
         path: sbom.spdx.json
 
     - name: SBOM upload
-      uses: advanced-security/spdx-dependency-submission-action@v0.0.1
+      uses: advanced-security/spdx-dependency-submission-action@v0.2.0
 
     - name: Upload Trivy scan results to GitHub Security tab [all]
-      uses: github/codeql-action/upload-sarif@v3
+      uses: github/codeql-action/upload-sarif@v4
       with:
         sarif_file: 'trivy-results-all.sarif'
         category: all
 
     - name: Upload Trivy scan results to GitHub Security tab [fix-available]
-      uses: github/codeql-action/upload-sarif@v3
+      uses: github/codeql-action/upload-sarif@v4
       with:
         sarif_file: 'trivy-results-with-fix.sarif'
         category: fix-available

.ruby-version

@@ -1 +1 @@
-3.2.0
+3.3

Gemfile.lock

@@ -6,33 +6,33 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.4.4)
-    fakefs (2.0.0)
+    diff-lcs (1.6.2)
+    fakefs (3.2.1)
     little-plugger (1.1.4)
-    logging (2.3.0)
+    logging (2.4.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    multi_json (1.15.0)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    multi_json (1.19.1)
+    rake (13.3.1)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
+      rspec-support (~> 3.13.0)
     rspec-instafail (1.0.0)
       rspec
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.10.2)
+    rspec-its (2.0.0)
+      rspec-core (>= 3.13.0)
+      rspec-expectations (>= 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    timecop (0.9.4)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    timecop (0.9.10)
 
 PLATFORMS
   ruby
@@ -48,4 +48,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   2.4.4
+   2.5.23

acceptance-tests/.golangci.yml

@@ -0,0 +1,12 @@
+version: "2"
+
+linters:
+  default: standard
+
+  settings:
+    errcheck:
+      check-blank: true # assignment to blank identifier: `_ := someFunc()`.
+
+formatters:
+  enable:
+  - goimports

acceptance-tests/go.mod

@@ -1,26 +1,26 @@
 module github.com/cloudfoundry/bosh-linux-stemcell-builder/acceptance-tests
 
-go 1.22.0
-
-toolchain go1.23.5
+go 1.25.0
 
 require (
-	github.com/cloudfoundry/bosh-utils v0.0.523
-	github.com/onsi/ginkgo/v2 v2.22.2
-	github.com/onsi/gomega v1.36.2
+	github.com/cloudfoundry/bosh-utils v0.0.605
+	github.com/onsi/ginkgo/v2 v2.28.1
+	github.com/onsi/gomega v1.39.1
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
+	github.com/Masterminds/semver/v3 v3.4.0 // indirect
 	github.com/bmatcuk/doublestar v1.3.4 // indirect
-	github.com/charlievieth/fs v0.0.3 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/tools v0.29.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/mod v0.34.0 // indirect
+	golang.org/x/net v0.53.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/sys v0.43.0 // indirect
+	golang.org/x/text v0.36.0 // indirect
+	golang.org/x/tools v0.43.0 // indirect
 )