Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release-1.25] Fix GitHub actions CI #6505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jan 9, 2023
Merged

[release-1.25] Fix GitHub actions CI #6505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,7 @@ jobs:
with:
name: build
path: bin
- run: |
chmod -R +x bin
sudo rm /etc/containers/storage.conf
- run: chmod -R +x bin
- run: |
sudo -E make docs-generation
hack/tree_status.sh
Expand All @@ -104,9 +102,7 @@ jobs:
with:
name: build
path: bin
- run: |
chmod -R +x bin
sudo rm /etc/containers/storage.conf
- run: chmod -R +x bin
- run: |
sudo -E make completions-generation
hack/tree_status.sh
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@ jobs:
- uses: actions/setup-go@v3
with:
go-version: ${{ env.GO_VERSION }}
- run: scripts/github-actions-packages
- uses: golangci/golangci-lint-action@v3
with:
version: v1.49.0

# Only show new issues for a pull request.
only-new-issues: true

shellcheck:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 2 additions & 0 deletions internal/factory/container/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ func New() (Container, error) {
}

// SpecAddMount adds a specified mount to the spec
//
//nolint:gocritic // passing the spec mount around here is intentional
func (c *container) SpecAddMount(r rspec.Mount) {
c.spec.RemoveMount(r.Destination)
c.spec.AddMount(r)
Expand Down
2 changes: 1 addition & 1 deletion scripts/github-actions-packages
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -euo pipefail

CRIU_REPO="https://download.opensuse.org/repositories/devel:/tools:/criu/xUbuntu_20.04"
CRIU_REPO="https://download.opensuse.org/repositories/devel:/tools:/criu/xUbuntu_22.04"

curl -fSsl $CRIU_REPO/Release.key | sudo apt-key add -
echo "deb $CRIU_REPO/ /" | sudo tee /etc/apt/sources.list.d/criu.list
Expand Down