Merge release branch into main#1842
Merged
rhatdan merged 6 commits intocontainers:mainfrom Feb 15, 2023
Merged
Conversation
Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This is quite loud in case it decides not to reconnect, so that we can have an idea of the failing situations. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
- Try to reconnect on _some_ aborted layer downloads Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
[release-5.24] Reconnecting blob reader
1 task
fb7fa87 to
7269bcc
Compare
Collaborator
Author
|
@vrothberg PTAL |
7269bcc to
70ce07c
Compare
Member
|
LGTM |
mtrmac
added a commit
to mtrmac/skopeo
that referenced
this pull request
Feb 15, 2023
... so that Renovate doesn't keep proposing a downgrade. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
vrothberg
added a commit
to containers/skopeo
that referenced
this pull request
Feb 16, 2023
Update c/image after containers/image#1842
doanac
pushed a commit
to lmp-mirrors/meta-virtualization
that referenced
this pull request
May 20, 2023
Note: this has trimpath issues, and needs to be re-worked to not use
symlinked vendor directories.
Bumping skopeo to version v1.12.0-25-gcf502780, which comprises the following commits:
c06aa5c6 Update module github.com/stretchr/testify to v1.8.3
ac75f71f Update dependency containers/automation_images to v20230517
21b1dfee Update module github.com/sirupsen/logrus to v1.9.2
ead979a9 Update module github.com/docker/distribution to v2.8.2+incompatible
12b24fce Trigger an update of the ostree_ext container image
44ed4cea Update c/image with containers/image#1944
9213943e Update module github.com/containers/common to v0.53.0
2825ffd9 Update module golang.org/x/term to v0.8.0
86eea6ce Update dependency containers/automation_images to v20230426
03e18aa9 Update golang.org/x/exp digest to 47ecfdc
7b587697 Emphasize the semantics of --preserve-digests a tiny bit
1e6b333f Improve the static build documentation a tiny bit
95e8cce2 Bump to v1.12.1-dev
a5529097 Release 1.12.0
5f0314f3 Update module github.com/containers/common to v0.52.0
66157589 Update module github.com/containers/storage to v1.46.1
7c66b740 Add (make tools) to install (for now only) golangci-lint, use it in Cirrus
d4bd787e Use golangci-lint instead of golint
c538340e Finally, eliminate hack/make.sh
f8f5a25f Actually fail if (go vet) fails
aebab492 Speed up validate-git-marks by about a factor of three
4298692d Don't use hack/make.sh for validate-git-marks
7e35ad54 Test all files by validate-git-marks
789257f7 Simplify the package list of (go vet)
bee51e5e Don't use hack/make.sh for validate-gofmt
85fef036 Run gofmt on all files, not just the changed ones
82268ea8 Don't use hack/make.sh for validate-lint
694b1565 Lint many more files in validate-lint
43090b29 Don't use hack/make.sh for validate-vet
225f239a Remove no-longer-necessary module options
98b01af0 Fix Makefile dependencies
835d71a3 Remove some outright unused code from hack/make*
30ecd8f0 Cross-link the top-level and subcommand option lists
4be583c8 Fix error handling of signature.NewEphemeralGPGSigningMechanism
e8414097 chore(deps): update dependency containers/automation_images to v20230405
4f5e8214 Avoid use of a deprecated capability.NewPid
ca0f8418 fix(deps): update module github.com/spf13/cobra to v1.7.0
b0d339f0 fix(deps): update module github.com/containers/image/v5 to v5.25.0
03ca2871 fix(deps): update module golang.org/x/term to v0.7.0
4ca2058d Use multiple fingerprint function Allow comma separated fingerprint list
c54f2025 Review comments (to be squashed later
9b1f1fa1 Rename argument. Only use any with public key file. Double check fingerprint is in public key file.
3097b7a4 Verify signatures from a trust store
bfe82593 Update c/image from the main branch
468ac655 Update module github.com/containers/common to v0.51.2
7481aae6 Update dependency containers/automation_images to v20230330
454f8559 systemtests: Fix 040-local-registry-auth about XDG_RUNTIME_DIR
bbdcb79c [CI:BUILD] Packit: trigger builds on commit to main branch
cd4f2ee5 [skip-ci] Update actions/stale action to v8
b2ede999 Make the installation instructions more prominent in README.md
8ea5fd44 Update dependency containers/automation_images to v20230320
aa9862a7 Update module github.com/containers/common to v0.51.1
0ad54d6d Cirrus: Update CI VM images
20447df1 bump golang.org/x/net to v0.8.0
3481a5b9 Update module golang.org/x/term to v0.6.0
bcc0d54e Simplify inspectOptions.writeOutput a bit more
c345785d Factor out the output of data in (skopeo inspect)
2a6a944c Use io.WriteString
9a02c1eb Update module github.com/stretchr/testify to v1.8.2
f1c03ef1 Update module github.com/containers/storage to v1.45.4
64daedca Update golang.org/x/exp digest to 5e25df0
c07f2098 Fix formatting of inspect examples
313f142c Use common library reporter
4beb3f0a Fix some warnings
1c3d49f0 Fix tabelating output in (skopeo inspect --format)
fb0be613 Corrected typo in skopeo-sync and updated description
2ef9cf69 Replace gopkg.in/check.v1 by github.com/stretchr/testify/suite/
0ba164f0 Update c/image after containers/image#1842
012e1144 [CI:BUILD] Packit: initial enablement
5435c808 Renovate: c/common rule moved to defaults
643a2359 Update c/image after containers/image#1816
2c6e15b5 Run codespell on codebase
df708d16 [CI:DOCS] Disable dependabot
2acac8a6 Update module golang.org/x/term to v0.5.0
f9e2c676 Update golang.org/x/exp digest to 46f607a
47c7902e Remove unnecessary blank lines
c1a57ca1 Pre-allocate an array
2a7b1327 Simplify a condition
e7ab33e6 Rename a variable to avoid an underscore
e90c381a Add missing comment punctuation
70c06b4a Fix, or remove, comments using lint syntax
9137ac56 Simplify an increment
efc6e837 Reformat import statements
a8b9e4e3 Use %w when wrapping errors
99215e40 Remove a duplicate word
afa031e8 Use net/netip.Addr instead of net.IP
891ba3d4 s/interface{}/any/g
f2b3a9c0 Use golang.org/x/exp
f1a6d427 Use strings.Cut
22955d05 go mod tidy -go=1.18
007f01c6 [CI:BUILD] enable debuginfo for el8 copr builds
036bf598 [CI:BUILD] copr: fix el8 build and enable debuginfo
f9406bb0 Cirrus: Use human-readable CI VM Images
b41b85ab Update module gopkg.in/yaml.v2 to v3
d2fbec35 Add unit tests for tlsVerifyConfig's yaml.Unmarshaler
9e24a195 [CI:DOCS] Fix up language in README
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
doanac
pushed a commit
to lmp-mirrors/meta-virtualization
that referenced
this pull request
May 29, 2023
Note: this has trimpath issues, and needs to be re-worked to not use
symlinked vendor directories.
Bumping skopeo to version v1.12.0-25-gcf502780, which comprises the following commits:
c06aa5c6 Update module github.com/stretchr/testify to v1.8.3
ac75f71f Update dependency containers/automation_images to v20230517
21b1dfee Update module github.com/sirupsen/logrus to v1.9.2
ead979a9 Update module github.com/docker/distribution to v2.8.2+incompatible
12b24fce Trigger an update of the ostree_ext container image
44ed4cea Update c/image with containers/image#1944
9213943e Update module github.com/containers/common to v0.53.0
2825ffd9 Update module golang.org/x/term to v0.8.0
86eea6ce Update dependency containers/automation_images to v20230426
03e18aa9 Update golang.org/x/exp digest to 47ecfdc
7b587697 Emphasize the semantics of --preserve-digests a tiny bit
1e6b333f Improve the static build documentation a tiny bit
95e8cce2 Bump to v1.12.1-dev
a5529097 Release 1.12.0
5f0314f3 Update module github.com/containers/common to v0.52.0
66157589 Update module github.com/containers/storage to v1.46.1
7c66b740 Add (make tools) to install (for now only) golangci-lint, use it in Cirrus
d4bd787e Use golangci-lint instead of golint
c538340e Finally, eliminate hack/make.sh
f8f5a25f Actually fail if (go vet) fails
aebab492 Speed up validate-git-marks by about a factor of three
4298692d Don't use hack/make.sh for validate-git-marks
7e35ad54 Test all files by validate-git-marks
789257f7 Simplify the package list of (go vet)
bee51e5e Don't use hack/make.sh for validate-gofmt
85fef036 Run gofmt on all files, not just the changed ones
82268ea8 Don't use hack/make.sh for validate-lint
694b1565 Lint many more files in validate-lint
43090b29 Don't use hack/make.sh for validate-vet
225f239a Remove no-longer-necessary module options
98b01af0 Fix Makefile dependencies
835d71a3 Remove some outright unused code from hack/make*
30ecd8f0 Cross-link the top-level and subcommand option lists
4be583c8 Fix error handling of signature.NewEphemeralGPGSigningMechanism
e8414097 chore(deps): update dependency containers/automation_images to v20230405
4f5e8214 Avoid use of a deprecated capability.NewPid
ca0f8418 fix(deps): update module github.com/spf13/cobra to v1.7.0
b0d339f0 fix(deps): update module github.com/containers/image/v5 to v5.25.0
03ca2871 fix(deps): update module golang.org/x/term to v0.7.0
4ca2058d Use multiple fingerprint function Allow comma separated fingerprint list
c54f2025 Review comments (to be squashed later
9b1f1fa1 Rename argument. Only use any with public key file. Double check fingerprint is in public key file.
3097b7a4 Verify signatures from a trust store
bfe82593 Update c/image from the main branch
468ac655 Update module github.com/containers/common to v0.51.2
7481aae6 Update dependency containers/automation_images to v20230330
454f8559 systemtests: Fix 040-local-registry-auth about XDG_RUNTIME_DIR
bbdcb79c [CI:BUILD] Packit: trigger builds on commit to main branch
cd4f2ee5 [skip-ci] Update actions/stale action to v8
b2ede999 Make the installation instructions more prominent in README.md
8ea5fd44 Update dependency containers/automation_images to v20230320
aa9862a7 Update module github.com/containers/common to v0.51.1
0ad54d6d Cirrus: Update CI VM images
20447df1 bump golang.org/x/net to v0.8.0
3481a5b9 Update module golang.org/x/term to v0.6.0
bcc0d54e Simplify inspectOptions.writeOutput a bit more
c345785d Factor out the output of data in (skopeo inspect)
2a6a944c Use io.WriteString
9a02c1eb Update module github.com/stretchr/testify to v1.8.2
f1c03ef1 Update module github.com/containers/storage to v1.45.4
64daedca Update golang.org/x/exp digest to 5e25df0
c07f2098 Fix formatting of inspect examples
313f142c Use common library reporter
4beb3f0a Fix some warnings
1c3d49f0 Fix tabelating output in (skopeo inspect --format)
fb0be613 Corrected typo in skopeo-sync and updated description
2ef9cf69 Replace gopkg.in/check.v1 by github.com/stretchr/testify/suite/
0ba164f0 Update c/image after containers/image#1842
012e1144 [CI:BUILD] Packit: initial enablement
5435c808 Renovate: c/common rule moved to defaults
643a2359 Update c/image after containers/image#1816
2c6e15b5 Run codespell on codebase
df708d16 [CI:DOCS] Disable dependabot
2acac8a6 Update module golang.org/x/term to v0.5.0
f9e2c676 Update golang.org/x/exp digest to 46f607a
47c7902e Remove unnecessary blank lines
c1a57ca1 Pre-allocate an array
2a7b1327 Simplify a condition
e7ab33e6 Rename a variable to avoid an underscore
e90c381a Add missing comment punctuation
70c06b4a Fix, or remove, comments using lint syntax
9137ac56 Simplify an increment
efc6e837 Reformat import statements
a8b9e4e3 Use %w when wrapping errors
99215e40 Remove a duplicate word
afa031e8 Use net/netip.Addr instead of net.IP
891ba3d4 s/interface{}/any/g
f2b3a9c0 Use golang.org/x/exp
f1a6d427 Use strings.Cut
22955d05 go mod tidy -go=1.18
007f01c6 [CI:BUILD] enable debuginfo for el8 copr builds
036bf598 [CI:BUILD] copr: fix el8 build and enable debuginfo
f9406bb0 Cirrus: Use human-readable CI VM Images
b41b85ab Update module gopkg.in/yaml.v2 to v3
d2fbec35 Add unit tests for tlsVerifyConfig's yaml.Unmarshaler
9e24a195 [CI:DOCS] Fix up language in README
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
doanac
pushed a commit
to lmp-mirrors/meta-virtualization
that referenced
this pull request
Jun 7, 2023
Note: this has trimpath issues, and needs to be re-worked to not use
symlinked vendor directories.
Bumping skopeo to version v1.12.0-25-gcf502780, which comprises the following commits:
c06aa5c6 Update module github.com/stretchr/testify to v1.8.3
ac75f71f Update dependency containers/automation_images to v20230517
21b1dfee Update module github.com/sirupsen/logrus to v1.9.2
ead979a9 Update module github.com/docker/distribution to v2.8.2+incompatible
12b24fce Trigger an update of the ostree_ext container image
44ed4cea Update c/image with containers/image#1944
9213943e Update module github.com/containers/common to v0.53.0
2825ffd9 Update module golang.org/x/term to v0.8.0
86eea6ce Update dependency containers/automation_images to v20230426
03e18aa9 Update golang.org/x/exp digest to 47ecfdc
7b587697 Emphasize the semantics of --preserve-digests a tiny bit
1e6b333f Improve the static build documentation a tiny bit
95e8cce2 Bump to v1.12.1-dev
a5529097 Release 1.12.0
5f0314f3 Update module github.com/containers/common to v0.52.0
66157589 Update module github.com/containers/storage to v1.46.1
7c66b740 Add (make tools) to install (for now only) golangci-lint, use it in Cirrus
d4bd787e Use golangci-lint instead of golint
c538340e Finally, eliminate hack/make.sh
f8f5a25f Actually fail if (go vet) fails
aebab492 Speed up validate-git-marks by about a factor of three
4298692d Don't use hack/make.sh for validate-git-marks
7e35ad54 Test all files by validate-git-marks
789257f7 Simplify the package list of (go vet)
bee51e5e Don't use hack/make.sh for validate-gofmt
85fef036 Run gofmt on all files, not just the changed ones
82268ea8 Don't use hack/make.sh for validate-lint
694b1565 Lint many more files in validate-lint
43090b29 Don't use hack/make.sh for validate-vet
225f239a Remove no-longer-necessary module options
98b01af0 Fix Makefile dependencies
835d71a3 Remove some outright unused code from hack/make*
30ecd8f0 Cross-link the top-level and subcommand option lists
4be583c8 Fix error handling of signature.NewEphemeralGPGSigningMechanism
e8414097 chore(deps): update dependency containers/automation_images to v20230405
4f5e8214 Avoid use of a deprecated capability.NewPid
ca0f8418 fix(deps): update module github.com/spf13/cobra to v1.7.0
b0d339f0 fix(deps): update module github.com/containers/image/v5 to v5.25.0
03ca2871 fix(deps): update module golang.org/x/term to v0.7.0
4ca2058d Use multiple fingerprint function Allow comma separated fingerprint list
c54f2025 Review comments (to be squashed later
9b1f1fa1 Rename argument. Only use any with public key file. Double check fingerprint is in public key file.
3097b7a4 Verify signatures from a trust store
bfe82593 Update c/image from the main branch
468ac655 Update module github.com/containers/common to v0.51.2
7481aae6 Update dependency containers/automation_images to v20230330
454f8559 systemtests: Fix 040-local-registry-auth about XDG_RUNTIME_DIR
bbdcb79c [CI:BUILD] Packit: trigger builds on commit to main branch
cd4f2ee5 [skip-ci] Update actions/stale action to v8
b2ede999 Make the installation instructions more prominent in README.md
8ea5fd44 Update dependency containers/automation_images to v20230320
aa9862a7 Update module github.com/containers/common to v0.51.1
0ad54d6d Cirrus: Update CI VM images
20447df1 bump golang.org/x/net to v0.8.0
3481a5b9 Update module golang.org/x/term to v0.6.0
bcc0d54e Simplify inspectOptions.writeOutput a bit more
c345785d Factor out the output of data in (skopeo inspect)
2a6a944c Use io.WriteString
9a02c1eb Update module github.com/stretchr/testify to v1.8.2
f1c03ef1 Update module github.com/containers/storage to v1.45.4
64daedca Update golang.org/x/exp digest to 5e25df0
c07f2098 Fix formatting of inspect examples
313f142c Use common library reporter
4beb3f0a Fix some warnings
1c3d49f0 Fix tabelating output in (skopeo inspect --format)
fb0be613 Corrected typo in skopeo-sync and updated description
2ef9cf69 Replace gopkg.in/check.v1 by github.com/stretchr/testify/suite/
0ba164f0 Update c/image after containers/image#1842
012e1144 [CI:BUILD] Packit: initial enablement
5435c808 Renovate: c/common rule moved to defaults
643a2359 Update c/image after containers/image#1816
2c6e15b5 Run codespell on codebase
df708d16 [CI:DOCS] Disable dependabot
2acac8a6 Update module golang.org/x/term to v0.5.0
f9e2c676 Update golang.org/x/exp digest to 46f607a
47c7902e Remove unnecessary blank lines
c1a57ca1 Pre-allocate an array
2a7b1327 Simplify a condition
e7ab33e6 Rename a variable to avoid an underscore
e90c381a Add missing comment punctuation
70c06b4a Fix, or remove, comments using lint syntax
9137ac56 Simplify an increment
efc6e837 Reformat import statements
a8b9e4e3 Use %w when wrapping errors
99215e40 Remove a duplicate word
afa031e8 Use net/netip.Addr instead of net.IP
891ba3d4 s/interface{}/any/g
f2b3a9c0 Use golang.org/x/exp
f1a6d427 Use strings.Cut
22955d05 go mod tidy -go=1.18
007f01c6 [CI:BUILD] enable debuginfo for el8 copr builds
036bf598 [CI:BUILD] copr: fix el8 build and enable debuginfo
f9406bb0 Cirrus: Use human-readable CI VM Images
b41b85ab Update module gopkg.in/yaml.v2 to v3
d2fbec35 Add unit tests for tlsVerifyConfig's yaml.Unmarshaler
9e24a195 [CI:DOCS] Fix up language in README
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
doanac
pushed a commit
to lmp-mirrors/meta-virtualization
that referenced
this pull request
Jun 15, 2023
Note: this has trimpath issues, and needs to be re-worked to not use
symlinked vendor directories.
Bumping skopeo to version v1.12.0-25-gcf502780, which comprises the following commits:
c06aa5c6 Update module github.com/stretchr/testify to v1.8.3
ac75f71f Update dependency containers/automation_images to v20230517
21b1dfee Update module github.com/sirupsen/logrus to v1.9.2
ead979a9 Update module github.com/docker/distribution to v2.8.2+incompatible
12b24fce Trigger an update of the ostree_ext container image
44ed4cea Update c/image with containers/image#1944
9213943e Update module github.com/containers/common to v0.53.0
2825ffd9 Update module golang.org/x/term to v0.8.0
86eea6ce Update dependency containers/automation_images to v20230426
03e18aa9 Update golang.org/x/exp digest to 47ecfdc
7b587697 Emphasize the semantics of --preserve-digests a tiny bit
1e6b333f Improve the static build documentation a tiny bit
95e8cce2 Bump to v1.12.1-dev
a5529097 Release 1.12.0
5f0314f3 Update module github.com/containers/common to v0.52.0
66157589 Update module github.com/containers/storage to v1.46.1
7c66b740 Add (make tools) to install (for now only) golangci-lint, use it in Cirrus
d4bd787e Use golangci-lint instead of golint
c538340e Finally, eliminate hack/make.sh
f8f5a25f Actually fail if (go vet) fails
aebab492 Speed up validate-git-marks by about a factor of three
4298692d Don't use hack/make.sh for validate-git-marks
7e35ad54 Test all files by validate-git-marks
789257f7 Simplify the package list of (go vet)
bee51e5e Don't use hack/make.sh for validate-gofmt
85fef036 Run gofmt on all files, not just the changed ones
82268ea8 Don't use hack/make.sh for validate-lint
694b1565 Lint many more files in validate-lint
43090b29 Don't use hack/make.sh for validate-vet
225f239a Remove no-longer-necessary module options
98b01af0 Fix Makefile dependencies
835d71a3 Remove some outright unused code from hack/make*
30ecd8f0 Cross-link the top-level and subcommand option lists
4be583c8 Fix error handling of signature.NewEphemeralGPGSigningMechanism
e8414097 chore(deps): update dependency containers/automation_images to v20230405
4f5e8214 Avoid use of a deprecated capability.NewPid
ca0f8418 fix(deps): update module github.com/spf13/cobra to v1.7.0
b0d339f0 fix(deps): update module github.com/containers/image/v5 to v5.25.0
03ca2871 fix(deps): update module golang.org/x/term to v0.7.0
4ca2058d Use multiple fingerprint function Allow comma separated fingerprint list
c54f2025 Review comments (to be squashed later
9b1f1fa1 Rename argument. Only use any with public key file. Double check fingerprint is in public key file.
3097b7a4 Verify signatures from a trust store
bfe82593 Update c/image from the main branch
468ac655 Update module github.com/containers/common to v0.51.2
7481aae6 Update dependency containers/automation_images to v20230330
454f8559 systemtests: Fix 040-local-registry-auth about XDG_RUNTIME_DIR
bbdcb79c [CI:BUILD] Packit: trigger builds on commit to main branch
cd4f2ee5 [skip-ci] Update actions/stale action to v8
b2ede999 Make the installation instructions more prominent in README.md
8ea5fd44 Update dependency containers/automation_images to v20230320
aa9862a7 Update module github.com/containers/common to v0.51.1
0ad54d6d Cirrus: Update CI VM images
20447df1 bump golang.org/x/net to v0.8.0
3481a5b9 Update module golang.org/x/term to v0.6.0
bcc0d54e Simplify inspectOptions.writeOutput a bit more
c345785d Factor out the output of data in (skopeo inspect)
2a6a944c Use io.WriteString
9a02c1eb Update module github.com/stretchr/testify to v1.8.2
f1c03ef1 Update module github.com/containers/storage to v1.45.4
64daedca Update golang.org/x/exp digest to 5e25df0
c07f2098 Fix formatting of inspect examples
313f142c Use common library reporter
4beb3f0a Fix some warnings
1c3d49f0 Fix tabelating output in (skopeo inspect --format)
fb0be613 Corrected typo in skopeo-sync and updated description
2ef9cf69 Replace gopkg.in/check.v1 by github.com/stretchr/testify/suite/
0ba164f0 Update c/image after containers/image#1842
012e1144 [CI:BUILD] Packit: initial enablement
5435c808 Renovate: c/common rule moved to defaults
643a2359 Update c/image after containers/image#1816
2c6e15b5 Run codespell on codebase
df708d16 [CI:DOCS] Disable dependabot
2acac8a6 Update module golang.org/x/term to v0.5.0
f9e2c676 Update golang.org/x/exp digest to 46f607a
47c7902e Remove unnecessary blank lines
c1a57ca1 Pre-allocate an array
2a7b1327 Simplify a condition
e7ab33e6 Rename a variable to avoid an underscore
e90c381a Add missing comment punctuation
70c06b4a Fix, or remove, comments using lint syntax
9137ac56 Simplify an increment
efc6e837 Reformat import statements
a8b9e4e3 Use %w when wrapping errors
99215e40 Remove a duplicate word
afa031e8 Use net/netip.Addr instead of net.IP
891ba3d4 s/interface{}/any/g
f2b3a9c0 Use golang.org/x/exp
f1a6d427 Use strings.Cut
22955d05 go mod tidy -go=1.18
007f01c6 [CI:BUILD] enable debuginfo for el8 copr builds
036bf598 [CI:BUILD] copr: fix el8 build and enable debuginfo
f9406bb0 Cirrus: Use human-readable CI VM Images
b41b85ab Update module gopkg.in/yaml.v2 to v3
d2fbec35 Add unit tests for tlsVerifyConfig's yaml.Unmarshaler
9e24a195 [CI:DOCS] Fix up language in README
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This merges the
release-5.24branch into main. Effects of this:version.goonmainis updated to a version after the last released one, reducing the risk of trying to release the same version againrelease-5.24is present onmainmainto bev5.24.2-0.…, notv5.24.1–0.…, because thev5.24.1tag is reachable onmain. That should, in turn, help automated upgrade tools to stop proposing downgrades from themainbranch to the release branch, like fix(deps): update module github.com/containers/image/v5 to v5.25.0 skopeo#1903 .The last part is a somewhat-researched hypothesis, but it’s basically an experiment. We can’t do that experiment without actually publishing and tagging packages on GitHub — OTOH we could, plausibly, do that in a test repo instead of here.
I think that this is low-risk and not worth the extra effort to test separately, but I can be mistaken, so I do want a second pair of eyes on this before making the merge.
(Note that just looking at the list of the commits in GitHub UI might not be very helpful; see the PR branch in a GUI that shows the commit graph.)