Remove 20.04

.semaphore/release.yml

@@ -2,8 +2,8 @@ version: v1.0
 name: Release
 agent:
   machine:
-    type: e2-standard-2
-    os_image: ubuntu2004
+    type: f1-standard-2
+    os_image: ubuntu2404
 blocks:
   - name: Release
     task:

.semaphore/semaphore.yml

@@ -2,8 +2,8 @@ version: v1.0
 name: Toolbox S2 project
 agent:
   machine:
-    type: e2-standard-2
-    os_image: ubuntu2004
+    type: f1-standard-2
+    os_image: ubuntu2404
 
 execution_time_limit:
   minutes: 30
@@ -15,7 +15,7 @@ blocks:
       jobs:
         - name: Build cache CLI
           commands:
-            - sem-version go 1.22
+            - sem-version go 1.25.6
             - "export GOPATH=~/go"
             - "export PATH=/home/semaphore/go/bin:$PATH"
             - checkout
@@ -32,7 +32,7 @@ blocks:
             - artifact push workflow bin/windows/cache.exe -d bin/windows/cache.exe
         - name: Build sem-context CLI
           commands:
-            - sem-version go 1.22
+            - sem-version go 1.25.6
             - "export GOPATH=~/go"
             - "export PATH=/home/semaphore/go/bin:$PATH"
             - checkout
@@ -49,7 +49,7 @@ blocks:
             - artifact push workflow bin/windows/sem-context.exe -d bin/windows/sem-context.exe
         - name: Build test-results CLI
           commands:
-            - sem-version go 1.24.6
+            - sem-version go 1.25.6
             - "export GOPATH=~/go"
             - "export PATH=/home/semaphore/go/bin:$PATH"
             - checkout
@@ -96,64 +96,14 @@ blocks:
           commands:
             - make pwsh.test
 
-  - name: Sem Version Tests Focal
-    dependencies:
-      - "Build local CLIs"
-    task:
-      agent:
-        machine:
-          type: e2-standard-2
-          os_image: ubuntu2004
-      prologue:
-        commands:
-          - checkout
-          - sudo apt-get update
-          - sudo apt-get install -y libargon2-0
-          - artifact pull workflow bin/linux/amd64/cache -d cache-cli/bin/linux/amd64/cache
-          - artifact pull workflow bin/linux/arm64/cache -d cache-cli/bin/linux/arm64/cache
-          - artifact pull workflow bin/darwin/amd64/cache -d cache-cli/bin/darwin/amd64/cache
-          - artifact pull workflow bin/darwin/arm64/cache -d cache-cli/bin/darwin/arm64/cache
-          - artifact pull workflow bin/linux/amd64/sem-context -d sem-context/bin/linux/amd64/sem-context
-          - artifact pull workflow bin/linux/arm64/sem-context -d sem-context/bin/linux/arm64/sem-context
-          - artifact pull workflow bin/darwin/amd64/sem-context -d sem-context/bin/darwin/amd64/sem-context
-          - artifact pull workflow bin/darwin/arm64/sem-context -d sem-context/bin/darwin/arm64/sem-context
-          - artifact pull workflow bin/linux/amd64/test-results -d test-results/bin/linux/amd64/test-results
-          - artifact pull workflow bin/linux/arm64/test-results -d test-results/bin/linux/arm64/test-results
-          - artifact pull workflow bin/darwin/amd64/test-results -d test-results/bin/darwin/amd64/test-results
-          - artifact pull workflow bin/darwin/arm64/test-results -d test-results/bin/darwin/arm64/test-results
-          - bash release/create.sh
-          - source release/install_in_tests.sh
-          - git submodule init && git submodule update
-          - sudo ./tests/support/bats-core/install.sh /usr/local
-
-      jobs:
-        - name: Sem Version
-          matrix:
-            - env_var: TEST
-              values:
-                - elixir
-                - erlang
-                - firefox
-                - gcc
-                - go
-                - java
-                - kubectl
-                - node
-                - php
-                - python
-                - ruby
-                - scala
-          commands:
-            - bats tests/sem_version_focal/${TEST}.bats
-
 
   - name: Sem Version Tests Jammy
     dependencies:
       - "Build local CLIs"
     task:
       agent:
         machine:
-          type: e2-standard-2
+          type: f1-standard-2
           os_image: ubuntu2204
       prologue:
         commands:
@@ -334,8 +284,8 @@ blocks:
     task:
       agent:
         machine:
-          type: e2-standard-2
-          os_image: ubuntu2004
+          type: f1-standard-2
+          os_image: ubuntu2404
         containers:
           - name: main
             image: "registry.semaphoreci.com/android:34-flutter"
@@ -364,7 +314,7 @@ blocks:
           commands:
             - bats tests/sem_version_container.bats
 
-  - name: Sem Service Tests Focal
+  - name: Sem Service Tests Noble
     dependencies:
       - "Build local CLIs"
     task:
@@ -388,7 +338,7 @@ blocks:
           - cd ~/$SEMAPHORE_GIT_DIR/
           - source release/install_in_tests.sh
       jobs:
-        - name: Sem Service Tests Focal
+        - name: Sem Service Tests Noble
           matrix:
             - env_var: TEST
               values:
@@ -499,11 +449,11 @@ blocks:
     task:
       agent:
         machine:
-          type: e2-standard-2
-          os_image: ubuntu2004
+          type: f1-standard-2
+          os_image: ubuntu2204
         containers:
           - name: main
-            image: "semaphoreci/ruby:2.6.2"
+            image: "semaphoreci/ruby:3.4.8"
       prologue:
         commands:
           - checkout
@@ -579,8 +529,8 @@ blocks:
     task:
       agent:
         machine:
-          type: e2-standard-2
-          os_image: ubuntu2004
+          type: f1-standard-2
+          os_image: ubuntu2204
         containers:
           - name: main
             image: "semaphoreci/alpine:3.9"
@@ -657,10 +607,9 @@ blocks:
           - artifact pull workflow bin/darwin/arm64/test-results -d test-results/bin/darwin/arm64/test-results
           - bash release/create.sh
           - source tests/sftp_server/start_on_linux.sh
-          - sudo apt-get install -y python3.8-dev
-          - sem-version python 3.8
-          - sem-version go 1.22
-          - sem-version php 7.3.23
+          - sem-version python 3.11
+          - sem-version go 1.25.6
+          - sem-version php 8.4.19
       jobs:
         - name: "Cache tests"
           matrix:
@@ -731,7 +680,7 @@ blocks:
     task:
       agent:
         machine:
-          type: e2-standard-2
+          type: f1-standard-2
           os_image: ubuntu2404
       prologue:
         commands:
@@ -750,10 +699,9 @@ blocks:
           - artifact pull workflow bin/darwin/arm64/test-results -d test-results/bin/darwin/arm64/test-results
           - bash release/create.sh
           - source tests/sftp_server/start_on_linux.sh
-          - sudo apt-get install -y python3.8-dev
           - sem-version python 3.11
-          - sem-version go 1.22
-          - sem-version php 8.2.20
+          - sem-version go 1.25.6
+          - sem-version php 8.4.19
       jobs:
         - name: "Non-cache tests"
           matrix:
@@ -801,7 +749,7 @@ blocks:
           value: "on"
       prologue:
         commands:
-          - sem-version go 1.22
+          - sem-version go 1.25.6
           - checkout && cd cache-cli
       jobs:
         - name: Lint
@@ -919,11 +867,11 @@ blocks:
     task:
       agent:
         machine:
-          type: e2-standard-2
-          os_image: ubuntu2004
+          type: f1-standard-2
+          os_image: ubuntu2204
         containers:
           - name: main
-            image: "registry.semaphoreci.com/ubuntu:20.04"
+            image: "registry.semaphoreci.com/ubuntu:22.04"
       prologue:
         commands:
           - checkout

cache-cli/Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM golang:1.23
+FROM golang:1.25
 
 RUN go install gotest.tools/gotestsum@v1.12.3
 RUN mkdir /root/.ssh

cache-cli/Makefile

@@ -10,14 +10,14 @@ check.prepare:
 check.static: check.prepare
 	docker run -it -v $$(pwd):/app \
 		-v $(SECURITY_TOOLBOX_TMP_DIR):$(SECURITY_TOOLBOX_TMP_DIR) \
-		registry.semaphoreci.com/ruby:2.7 \
+		registry.semaphoreci.com/ruby:3.4 \
 		bash -c 'cd /app && $(SECURITY_TOOLBOX_TMP_DIR)/code --language go -d'
 
 check.deps: check.prepare
 	docker run -it -v $$(pwd):/app \
 		-v $(SECURITY_TOOLBOX_TMP_DIR):$(SECURITY_TOOLBOX_TMP_DIR) \
 		-e TRIVY_DB_REPOSITORY -e TRIVY_JAVA_DB_REPOSITORY \
-		registry.semaphoreci.com/ruby:2.7 \
+		registry.semaphoreci.com/ruby:3.4 \
 		bash -c 'cd /app && $(SECURITY_TOOLBOX_TMP_DIR)/dependencies --language go -d'
 
 test.setup:

cache-cli/go.mod

@@ -1,9 +1,9 @@
 module github.com/semaphoreci/toolbox/cache-cli
 
-go 1.23.8
+go 1.25.0
 
 require (
-	cloud.google.com/go/storage v1.30.1
+	cloud.google.com/go/storage v1.56.0
 	github.com/aws/aws-sdk-go-v2 v1.18.0
 	github.com/aws/aws-sdk-go-v2/config v1.18.25
 	github.com/aws/aws-sdk-go-v2/credentials v1.13.24
@@ -14,15 +14,22 @@ require (
 	github.com/pkg/sftp v1.13.5
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.7.0
-	github.com/stretchr/testify v1.8.4
-	golang.org/x/crypto v0.35.0
-	google.golang.org/api v0.114.0
+	github.com/stretchr/testify v1.11.1
+	golang.org/x/crypto v0.49.0
+	google.golang.org/api v0.276.0
 )
 
 require (
-	cloud.google.com/go v0.110.0 // indirect
-	cloud.google.com/go/compute/metadata v0.3.0 // indirect
-	cloud.google.com/go/iam v0.13.0 // indirect
+	cel.dev/expr v0.25.1 // indirect
+	cloud.google.com/go v0.121.6 // indirect
+	cloud.google.com/go/auth v0.20.0 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
+	cloud.google.com/go/compute/metadata v0.9.0 // indirect
+	cloud.google.com/go/iam v1.5.3 // indirect
+	cloud.google.com/go/monitoring v1.24.3 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
@@ -36,29 +43,47 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
-	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.4 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/google/s2a-go v0.1.9 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
+	github.com/googleapis/gax-go/v2 v2.21.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/klauspost/compress v1.15.13 // indirect
 	github.com/kr/fs v0.1.0 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.56.3 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
+	go.opentelemetry.io/otel v1.43.0 // indirect
+	go.opentelemetry.io/otel/metric v1.43.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.43.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
+	go.opentelemetry.io/otel/trace v1.43.0 // indirect
+	golang.org/x/net v0.52.0 // indirect
+	golang.org/x/oauth2 v0.36.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/sys v0.42.0 // indirect
+	golang.org/x/text v0.35.0 // indirect
+	golang.org/x/time v0.15.0 // indirect
+	google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260319201613-d00831a3d3e7 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
+	google.golang.org/grpc v1.80.0 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )