Skip to content

Commit 9ffe547

Browse files
authored
Revert "Merge branch 'main' from github.com/containernetworking/plugins into 'master'" (#42)
1 parent 56432a2 commit 9ffe547

File tree

1,519 files changed

+45386
-139468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,519 files changed

+45386
-139468
lines changed

.github/actions/retest-action/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.21
1+
FROM alpine:3.10
22

33
RUN apk add --no-cache curl jq
44

.github/actions/retest-action/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ runs:
88
using: 'docker'
99
image: 'Dockerfile'
1010
env:
11-
GITHUB_TOKEN: ${{ inputs.token }}
11+
GITHUB_TOKEN: ${{ inputs.token }}

.github/actions/retest-action/entrypoint.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ curl --request GET \
2727
--header "authorization: Bearer ${GITHUB_TOKEN}" \
2828
--header "content-type: application/json" | jq '.workflow_runs | max_by(.run_number)' > run.json
2929

30-
RUN_URL=$(jq -r '.rerun_url' run.json)
30+
RERUN_URL=$(jq -r '.rerun_url' run.json)
3131

3232
curl --request POST \
33-
--url "${RUN_URL}/rerun-failed-jobs" \
33+
--url "${RERUN_URL}" \
3434
--header "authorization: Bearer ${GITHUB_TOKEN}" \
3535
--header "content-type: application/json"
3636

@@ -42,4 +42,4 @@ curl --request POST \
4242
--header "authorization: Bearer ${GITHUB_TOKEN}" \
4343
--header "accept: application/vnd.github.squirrel-girl-preview+json" \
4444
--header "content-type: application/json" \
45-
--data '{ "content" : "rocket" }'
45+
--data '{ "content" : "rocket" }'

.github/dependabot.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/go-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/commands.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Check out code
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v2
1313

1414
- name: Re-Test Action
1515
uses: ./.github/actions/retest-action

.github/workflows/release.yaml

Lines changed: 0 additions & 114 deletions
This file was deleted.

.github/workflows/test.yaml

Lines changed: 19 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,23 @@
11
---
22
name: test
33

4-
on:
5-
pull_request: {}
4+
on: ["push", "pull_request"]
65

76
env:
8-
LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le riscv64"
7+
GO_VERSION: "1.22"
8+
LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le"
99

1010
jobs:
11-
lint:
12-
name: Lint
13-
runs-on: ubuntu-latest
14-
steps:
15-
- uses: actions/checkout@v4
16-
- name: setup go
17-
uses: actions/setup-go@v5
18-
with:
19-
go-version-file: .github/go-version
20-
- uses: ibiqlik/action-yamllint@v3
21-
with:
22-
format: auto
23-
- uses: golangci/golangci-lint-action@v6
24-
with:
25-
version: v1.61.0
26-
args: -v
27-
verify-vendor:
28-
name: Verify vendor directory
29-
runs-on: ubuntu-latest
30-
steps:
31-
- uses: actions/checkout@v4
32-
- name: Install Go
33-
uses: actions/setup-go@v5
34-
with:
35-
go-version-file: .github/go-version
36-
- name: Check module vendoring
37-
run: |
38-
go mod tidy
39-
go mod vendor
40-
test -z "$(git status --porcelain)" || (echo "please run 'go mod tidy && go mod vendor', and submit your changes"; exit 1)
4111
build:
4212
name: Build all linux architectures
43-
needs: lint
4413
runs-on: ubuntu-latest
4514
steps:
46-
- uses: actions/checkout@v4
4715
- name: setup go
48-
uses: actions/setup-go@v5
16+
uses: actions/setup-go@v2
4917
with:
50-
go-version-file: .github/go-version
18+
go-version: ${{ env.GO_VERSION }}
19+
- uses: actions/checkout@v2
20+
5121
- name: Build on all supported architectures
5222
run: |
5323
set -e
@@ -56,9 +26,9 @@ jobs:
5626
GOARCH=$arch ./build_linux.sh
5727
rm bin/*
5828
done
29+
5930
test-linux:
6031
name: Run tests on Linux amd64
61-
needs: build
6232
runs-on: ubuntu-latest
6333
steps:
6434
- name: Install kernel module
@@ -67,25 +37,22 @@ jobs:
6737
sudo apt-get install linux-modules-extra-$(uname -r)
6838
- name: Install nftables
6939
run: sudo apt-get install nftables
70-
- name: Install dnsmasq(dhcp server)
71-
run: |
72-
sudo apt-get install dnsmasq
73-
sudo systemctl disable --now dnsmasq
74-
- uses: actions/checkout@v4
40+
7541
- name: setup go
76-
uses: actions/setup-go@v5
42+
uses: actions/setup-go@v2
7743
with:
78-
go-version-file: .github/go-version
44+
go-version: ${{ env.GO_VERSION }}
7945
- name: Set up Go for root
8046
run: |
8147
sudo ln -sf `which go` `sudo which go` || true
8248
sudo go version
49+
- uses: actions/checkout@v2
8350

8451
- name: Install test binaries
8552
run: |
86-
go install github.com/containernetworking/cni/cnitool@latest
87-
go install github.com/mattn/goveralls@latest
88-
go install github.com/modocache/gover@latest
53+
go install github.com/containernetworking/cni/cnitool@v1.2.2
54+
go install github.com/mattn/goveralls@v0.0.12
55+
go install github.com/modocache/gover@b58185e
8956
9057
- name: test
9158
run: PATH=$PATH:$(go env GOPATH)/bin COVERALLS=1 ./test_linux.sh
@@ -97,15 +64,15 @@ jobs:
9764
PATH=$PATH:$(go env GOPATH)/bin
9865
gover
9966
goveralls -coverprofile=gover.coverprofile -service=github
67+
10068
test-win:
10169
name: Build and run tests on Windows
102-
needs: build
10370
runs-on: windows-latest
10471
steps:
105-
- uses: actions/checkout@v4
10672
- name: setup go
107-
uses: actions/setup-go@v5
73+
uses: actions/setup-go@v2
10874
with:
109-
go-version-file: .github/go-version
75+
go-version: ${{ env.GO_VERSION }}
76+
- uses: actions/checkout@v2
11077
- name: test
11178
run: bash ./test_windows.sh

.golangci.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

.yamllint.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)