Remove go 1.21 and replace it with go 1.24 (#207)
* Remove go 1.21 and replace it with go 1.24
Signed-off-by: Luke Roy <luke.roy@ibm.com>
* keep go mode at 1.21
Signed-off-by: Luke Roy <luke.roy@ibm.com>
---------
Signed-off-by: Luke Roy <luke.roy@ibm.com>
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d88c4fe..d20f24e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -90,8 +90,8 @@
SHORT_COMMIT=$(git rev-parse --short "$GITHUB_SHA")
./gradlew :actionloop:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
./gradlew :actionloop:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
- ./gradlew :golang1.21:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
- ./gradlew :golang1.21:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
+ ./gradlew :golang1.24:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
+ ./gradlew :golang1.24:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
./gradlew :golang1.22:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
./gradlew :golang1.22:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=$SHORT_COMMIT
./gradlew :golang1.23:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk -PdockerImageTag=nightly
diff --git a/.gitignore b/.gitignore
index daec57c..8175f2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@
common/proxy
actionloop/proxy
golang1.20/proxy
-golang1.21/proxy
+golang1.24/proxy
golang1.22/proxy
golang1.23/proxy
diff --git a/docs/BUILD.md b/docs/BUILD.md
index f137408..ef2ffb4 100644
--- a/docs/BUILD.md
+++ b/docs/BUILD.md
@@ -43,7 +43,7 @@
This will build the images:
-* `action-golang-v1.21`: an image supporting Go 1.21 sources (does expect an ack)
+* `action-golang-v1.24`: an image supporting Go 1.24 sources (does expect an ack)
* `action-golang-v1.22`: an image supporting Go 1.22 sources (does expect an ack)
* `action-golang-v1.23`: an image supporting Go 1.23 sources (does expect an ack)
* `actionloop-base`: the base image, supporting generic executables ans shell script (does not expect an ack)
diff --git a/golang1.21/Dockerfile b/golang1.24/Dockerfile
similarity index 92%
rename from golang1.21/Dockerfile
rename to golang1.24/Dockerfile
index ff3b8e1..189dc1e 100644
--- a/golang1.21/Dockerfile
+++ b/golang1.24/Dockerfile
@@ -15,8 +15,8 @@
# limitations under the License.
#
-# Do not fix the patch level for golang:1.21 to automatically get security fixes.
-FROM golang:1.21-bookworm
+# Do not fix the patch level for golang:1.24 to automatically get security fixes.
+FROM golang:1.24-bookworm
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections &&\
apt-get update &&\
@@ -48,5 +48,5 @@
ENV OW_COMPILER=/bin/compile
ENV OW_LOG_INIT_ERROR=1
ENV OW_WAIT_FOR_ACK=1
-ENV OW_EXECUTION_ENV=openwhisk/action-golang-v1.21
+ENV OW_EXECUTION_ENV=openwhisk/action-golang-v1.24
ENTRYPOINT [ "/bin/proxy" ]
diff --git a/golang1.21/Makefile b/golang1.24/Makefile
similarity index 97%
rename from golang1.21/Makefile
rename to golang1.24/Makefile
index 2e51f8c..d9b2f45 100644
--- a/golang1.21/Makefile
+++ b/golang1.24/Makefile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-IMG=action-golang-v1.21
+IMG=action-golang-v1.24
build:
../gradlew distDocker
diff --git a/golang1.21/bin/compile b/golang1.24/bin/compile
similarity index 100%
rename from golang1.21/bin/compile
rename to golang1.24/bin/compile
diff --git a/golang1.21/build.gradle b/golang1.24/build.gradle
similarity index 96%
rename from golang1.21/build.gradle
rename to golang1.24/build.gradle
index 626537f..2092879 100644
--- a/golang1.21/build.gradle
+++ b/golang1.24/build.gradle
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-ext.dockerImageName = 'action-golang-v1.21'
+ext.dockerImageName = 'action-golang-v1.24'
apply from: '../gradle/docker.gradle'
distDocker.dependsOn 'staticBuildProxy'
diff --git a/golang1.21/lib/launcher.go b/golang1.24/lib/launcher.go
similarity index 100%
rename from golang1.21/lib/launcher.go
rename to golang1.24/lib/launcher.go
diff --git a/settings.gradle b/settings.gradle
index fa5cd8e..d6cf415 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,9 +18,9 @@
include 'tests'
include 'actionloop'
-include 'golang1.21'
include 'golang1.22'
include 'golang1.23'
+include 'golang1.24'
rootProject.name = 'runtime-golang'
diff --git a/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGo21Tests.scala b/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGo24Tests.scala
similarity index 92%
rename from tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGo21Tests.scala
rename to tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGo24Tests.scala
index ede38b3..cf04467 100644
--- a/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGo21Tests.scala
+++ b/tests/src/test/scala/runtime/actionContainers/ActionLoopBasicGo24Tests.scala
@@ -21,11 +21,11 @@
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class ActionLoopBasicGo21Tests
+class ActionLoopBasicGo24Tests
extends ActionLoopBasicGoTests
with WskActorSystem {
- override lazy val goCompiler = "action-golang-v1.21"
+ override lazy val goCompiler = "action-golang-v1.24"
override lazy val image = goCompiler
override lazy val requireAck = true
}
diff --git a/tests/src/test/scala/runtime/actionContainers/ActionLoopGo21ContainerTests.scala b/tests/src/test/scala/runtime/actionContainers/ActionLoopGo24ContainerTests.scala
similarity index 92%
rename from tests/src/test/scala/runtime/actionContainers/ActionLoopGo21ContainerTests.scala
rename to tests/src/test/scala/runtime/actionContainers/ActionLoopGo24ContainerTests.scala
index bbad7aa..8d95aa3 100644
--- a/tests/src/test/scala/runtime/actionContainers/ActionLoopGo21ContainerTests.scala
+++ b/tests/src/test/scala/runtime/actionContainers/ActionLoopGo24ContainerTests.scala
@@ -21,11 +21,11 @@
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
@RunWith(classOf[JUnitRunner])
-class ActionLoopGo21ContainerTests
+class ActionLoopGo24ContainerTests
extends ActionLoopGoContainerTests
with WskActorSystem {
- override lazy val goCompiler = "action-golang-v1.21"
+ override lazy val goCompiler = "action-golang-v1.24"
override lazy val image = goCompiler
}
