Skip to content

Commit

Permalink
Merge branch 'master' into pause
Browse files Browse the repository at this point in the history
  • Loading branch information
nwneisen authored Jan 22, 2025
2 parents de4a72c + 5c70d57 commit c6d761a
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 11 deletions.
45 changes: 43 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,62 @@
version: 2
updates:
## master updates
- package-ecosystem: gomod
target-branch: "master"
directory: "/"
schedule:
interval: 'weekly'
labels:
- 'dependabot'
- 'master'
open-pull-requests-limit: 5
groups:
# We are less concerned about the minor dependencies
minor-dependencies:
patterns:
- "*"
# Skip docker and k8 dependencies. We want to manually keep an eye on these
# Skip docker and k8 dependencies. We want to keep an eye on them separately
exclude-patterns:
- "*/docker/*"
- "*/moby/*"
- "*/opencontainers/*"
- "*/cri-api/*"
- "*/kubernetes/*"
major-dependencies:
patterns:
- "*/docker/*"
- "*/moby/*"
- "*/opencontainers/*"
- "*/cri-api/*"
- "*/kubernetes/*"
## release/0.3 updates
- package-ecosystem: gomod
target-branch: "release/0.3"
directory: "/"
schedule:
interval: 'weekly'
labels:
- 'dependabot'
- 'release/0.3'
open-pull-requests-limit: 5
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
groups:
minor-dependencies:
patterns:
- "*"
# Skip docker and k8 dependencies. We want to keep an eye on them separately
exclude-patterns:
- "*/docker/*"
- "*/moby/*"
- "*/opencontainers/*"
- "*/cri-api/*"
- "*/kubernetes/*"
major-dependencies:
patterns:
- "*/docker/*"
- "*/moby/*"
- "*/opencontainers/*"
- "*/cri-api/*"
- "*/kubernetes/*"

12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- name: Upload
if: ${{ github.event_name == 'release' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cri-dockerd
retention-days: 5
Expand All @@ -51,7 +51,7 @@ jobs:
run: make deb

- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cri-dockerd
retention-days: 5
Expand All @@ -78,7 +78,7 @@ jobs:
run: make rpm

- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cri-dockerd
retention-days: 5
Expand All @@ -105,7 +105,7 @@ jobs:
run: make cross-arm

- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cri-dockerd
retention-days: 5
Expand All @@ -132,7 +132,7 @@ jobs:

- name: Upload
if: ${{ github.event_name == 'release' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cri-dockerd
retention-days: 5
Expand All @@ -159,7 +159,7 @@ jobs:

- name: Upload
if: ${{ github.event_name == 'release' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cri-dockerd
retention-days: 5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
publish-binaries:
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: cri-dockerd
- name: Push binaries
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ Refer to the [install page](https://mirantis.github.io/cri-dockerd/usage/install

### Installing manually

If you want to run `cri-dockerd` on an unsupported platform, instructions can be found on the [manual install page](https://mirantis.github.io/cri-dockerd/usage/manual-install/).
If you want to run `cri-dockerd` on an unsupported platform, instructions can be found on the [manual install page](https://mirantis.github.io/cri-dockerd/usage/install-manually/).

### To use with Kubernetes

If you want to use `cri-dockerd` with Kubernetes, you can find instructions on the [Kubernetes page](https://mirantis.github.io/cri-dockerd/usage/kubernetes/).
If you want to use `cri-dockerd` with Kubernetes, you can find instructions on the [Kubernetes page](https://mirantis.github.io/cri-dockerd/usage/using-with-kubernetes/).

## Developing cri-dockerd

Expand Down

0 comments on commit c6d761a

Please sign in to comment.