From 62aa4515c50412201b64d68fc5616b0f57a7f514 Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Wed, 10 Jan 2024 16:15:00 +0000 Subject: [PATCH 1/4] Prepare 4.0.3 release --- .circleci/config.yml | 2 +- CHANGELOG.md | 2 +- INSTALL.md | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d265354086..1a8a2846a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ orbs: parameters: go-version: type: string - default: '1.21.4' + default: '1.21.6' executors: node: diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d6738f150..6dfe9492bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # SingularityCE Changelog -## Changes Since Last Release +## 4.0.3 \[2024-01-11\] ### Bug Fixes diff --git a/INSTALL.md b/INSTALL.md index 6e1c598048..a886242dff 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -163,7 +163,7 @@ _**NOTE:** if you are updating Go from a older version, make sure you remove `/usr/local/go` before reinstalling it._ ```sh -export VERSION=1.21.4 OS=linux ARCH=amd64 # change this as you need +export VERSION=1.21.6 OS=linux ARCH=amd64 # change this as you need wget -O /tmp/go${VERSION}.${OS}-${ARCH}.tar.gz \ https://dl.google.com/go/go${VERSION}.${OS}-${ARCH}.tar.gz @@ -221,11 +221,11 @@ cd singularity By default your clone will be on the `main` branch which is where development of SingularityCE happens. To build a specific version of SingularityCE, check out a [release tag](https://github.com/sylabs/singularity/tags) before -compiling. E.g. to build the 4.0.2 release, checkout the -`v4.0.2` tag: +compiling. E.g. to build the 4.0.3 release, checkout the +`v4.0.3` tag: ```sh -git checkout --recurse-submodules v4.0.2 +git checkout --recurse-submodules v4.0.3 ``` ## Compiling SingularityCE @@ -276,7 +276,7 @@ build and install the RPM like this: ```sh -export VERSION=4.0.2 # this is the singularity version, change as you need +export VERSION=4.0.3 # this is the singularity version, change as you need # Fetch the source wget https://github.com/sylabs/singularity/releases/download/v${VERSION}/singularity-ce-${VERSION}.tar.gz From 7b0d23bdb60f1250cad959777ca9c9eb4710a65d Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Wed, 10 Jan 2024 16:16:31 +0000 Subject: [PATCH 2/4] deps: bump conmon to v2.1.10 --- third_party/conmon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/conmon b/third_party/conmon index f633919178..2dcd736e46 160000 --- a/third_party/conmon +++ b/third_party/conmon @@ -1 +1 @@ -Subproject commit f633919178f6c8ee4fb41b848a056ec33f8d707d +Subproject commit 2dcd736e46ded79a53339462bc251694b150f870 From a6bb64c641e37297c61f08fefc5f49403a5dd225 Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Wed, 10 Jan 2024 16:18:59 +0000 Subject: [PATCH 3/4] deps: bump squashfuse to v0.5.0 release --- third_party/squashfuse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/squashfuse b/third_party/squashfuse index 590db2d762..3f4dd2928a 160000 --- a/third_party/squashfuse +++ b/third_party/squashfuse @@ -1 +1 @@ -Subproject commit 590db2d7621144e819a61eaa969b2cb720449e7d +Subproject commit 3f4dd2928ab362f8b20eab2be864d8e622472df5 From f79d6a86ee7e4c0c2e914b27c715f44577b03068 Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Wed, 10 Jan 2024 16:26:37 +0000 Subject: [PATCH 4/4] fix: update go-sqlite3 to fix failing alpine build See https://github.com/mattn/go-sqlite3/issues/1164 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 30877627c0..473f205298 100644 --- a/go.mod +++ b/go.mod @@ -125,7 +125,7 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect github.com/mattn/go-shellwords v1.0.12 // indirect - github.com/mattn/go-sqlite3 v1.14.18 // indirect + github.com/mattn/go-sqlite3 v1.14.19 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/miekg/pkcs11 v1.1.1 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect diff --git a/go.sum b/go.sum index 1af1f0c3bd..8bab338fed 100644 --- a/go.sum +++ b/go.sum @@ -341,8 +341,8 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= -github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI= -github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= +github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=