Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/aiohttp-3.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ejegrova authored Feb 19, 2024
2 parents 1c391f9 + 6129c17 commit 1175950
Show file tree
Hide file tree
Showing 28 changed files with 3,765 additions and 1,195 deletions.
14 changes: 13 additions & 1 deletion Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora-minimal:38
FROM registry.fedoraproject.org/fedora-minimal:39
LABEL maintainer="Red Hat"

WORKDIR /src
Expand Down Expand Up @@ -28,4 +28,16 @@ RUN npm install && \
corepack enable yarn && \
microdnf -y remove nodejs-npm

# Install an older version of Go fixed at 1.20 (along with the base >=1.21):
# - install Go's official shim
# - let the shim download the actual Go SDK (the download forces the output parent dir to $HOME)
# - move the SDK to a host local install system-wide location
# - remove the shim as it forces and expects the SDK to be used from $HOME
# - clean any build artifacts Go creates as part of the process.
RUN go install 'golang.org/dl/go1.20@latest' && \
"$HOME/go/bin/go1.20" download && \
mkdir /usr/local/go && \
mv "$HOME/sdk/go1.20" /usr/local/go && \
rm -rf "$HOME/go" "$HOME/.cache/go-build/"

ENTRYPOINT ["cachi2"]
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ original Cachito.*

<https://go.dev/ref/mod>

Current version: 1.20 [^go-version] [^go-compat]
Current version: 1.21 [^go-version] [^go-compat]

The gomod package manager works by parsing the [go.mod](https://go.dev/ref/mod#go-mod-file) file present in the source
repository to determine which dependencies to download. Cachi2 does not parse this file on its own - rather, we rely on
Expand All @@ -333,6 +333,17 @@ See [docs/gomod.md](docs/gomod.md) for more details.
the two versions. For example, dependency resolution did change in [go 1.18][go118-changelog] but not in
[go 1.19][go119-changelog].

#### Go 1.21+ *(since cachi2-v0.5.0)*
Starting with [Go 1.21][go121-changelog], Go changed the meaning of the `go 1.X` directive in
that it now specifies the [minimum required version](https://go.dev/ref/mod#go-mod-file-go) of Go
rather than a suggested version as it originally did. The format of the version string in the
`go` directive now also includes the micro release and if you don't include the micro release in
your `go.mod` file yourself (i.e. you only specify the language release) Go will try to correct
it automatically inside the file. Last but not least, Go 1.21 also introduced a new keyword
[`toolchain`](https://go.dev/ref/mod#go-mod-file-toolchain) to the `go.mod` file. What this all
means in practice for end users is that you may not be able to process your `go.mod` file with an older version
of Go (and hence older cachi2) as you could in the past for various reasons.

### pip

<https://pip.pypa.io/en/stable/>
Expand Down Expand Up @@ -392,4 +403,5 @@ still in early development phase.
[go117-changelog]: https://tip.golang.org/doc/go1.17#go-command
[go118-changelog]: https://tip.golang.org/doc/go1.18#go-command
[go119-changelog]: https://tip.golang.org/doc/go1.19#go-command
[go121-changelog]: https://tip.golang.org/doc/go1.21
[ocp-cachi2-pipelines]: https://console-openshift-console.apps.stone-prd-rh01.pg1f.p1.openshiftapps.com/pipelines/ns/tekton-ci/pipeline-runs?name=cachi2
Loading

0 comments on commit 1175950

Please sign in to comment.