Skip to content

fix flannel-cni-plugin build #3864

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
rawlingsj merged 2 commits into from
Jul 25, 2023
Merged

fix flannel-cni-plugin build #3864

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41fa653
fix flannel-cni-plugin build
ajayk Jul 24, 2023
7f59d94
Merge branch 'main' into flannel-cni-build
ajayk Jul 24, 2023
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
9 changes: 4 additions & 5 deletions flannel-cni-plugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: flannel-cni-plugin
version: 1.1.2
epoch: 2
version: 1.2.0
epoch: 0
description: flannel cni plugin
copyright:
- license: Apache-2.0
Expand All @@ -19,7 +19,7 @@ pipeline:
with:
repository: https://github.com/flannel-io/cni-plugin
tag: v${{package.version}}
expected-commit: 18a3027e7d03feeb6ecdfdbc3bf254a8c8b38b04
expected-commit: 6464faacf5c00e25321573225d74638455ef03a0

- runs: |
# Ensure we build statically since CNI plugins often get moved onto the
Expand All @@ -29,8 +29,7 @@ pipeline:
EXTRA_LDFLAGS="-s -w" \
scripts/build_flannel.sh

# "$BUILD_DIR" is hardcoded to ~/go/...
install -Dm755 $GOPATH/src/github.com/flannel-io/cni-plugin/dist/flannel-$(go env GOARCH) "${{targets.destdir}}"/usr/bin/flannel
install -Dm755 dist/flannel-$(go env GOARCH) "${{targets.destdir}}"/usr/bin/flannel

- uses: strip

Expand Down