diff options
| author | wujunyi <wu65830600@163.com> | 2023-09-26 11:02:14 +0800 |
|---|---|---|
| committer | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-21 15:07:03 +0800 |
| commit | 5e4b34acde5409a83a119900f95cf2ee99d3a9b0 (patch) | |
| tree | 9bcf37e43bce2f70c2a64975920d1fedade3a4c0 | |
| parent | feat: update to support release windows/amd64 (diff) | |
| download | kubeedge-5e4b34acde5409a83a119900f95cf2ee99d3a9b0.tar.gz | |
chore: update
Signed-off-by: wujunyi <wu65830600@163.com>
| -rw-r--r-- | .github/workflows/release.yml | 16 | ||||
| -rw-r--r-- | Makefile | 5 |
2 files changed, 13 insertions, 8 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 883a84409..6980999f4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,15 +44,15 @@ jobs: # 0 indicates all history for all branches and tags. # for `git describe --tags` in Makefile. fetch-depth: 0 - - name: Making and packaging(linux) - if: matrix.os == 'linux' + - name: Making and packaging run: | - docker pull kubeedge/build-tools:1.17.13-ke1 - make release WHAT=${{ matrix.target }} ARM_VERSION=${{ matrix.ARM_VERSION }} OS=${{ matrix.os }} BUILD_WITH_CONTAINER=true - - name: Making and packaging(windows) - if: matrix.os == 'windows' - run: | - make release WHAT=${{ matrix.target }} ARM_VERSION=${{ matrix.ARM_VERSION }} OS=${{ matrix.os }} BUILD_WITH_CONTAINER=false + if [ "${{ matrix.os }}" == "linux" ]; then + docker pull kubeedge/build-tools:1.17.13-ke1 + BUILD_CONTAINER=true + else + BUILD_CONTAINER=false + fi + make release WHAT=${{ matrix.target }} ARM_VERSION=${{ matrix.ARM_VERSION }} OS=${{ matrix.os }} BUILD_WITH_CONTAINER=$BUILD_CONTAINER - name: Generate arch run: | if [ "${{ matrix.ARM_VERSION }}" = "GOARM7" ]; then echo "output_arch=arm" >> $GITHUB_ENV; elif [ ${{ matrix.ARM_VERSION }} = "GOARM8" ]; then echo "output_arch=arm64" >> $GITHUB_ENV; else echo "output_arch=amd64" >> $GITHUB_ENV; fi @@ -434,12 +434,17 @@ define RELEASE_HELP_INFO # endef .PHONY: release + ifeq ($(HELP),y) release: @echo "$$RELEASE_HELP_INFO" else ifeq ($(BUILD_WITH_CONTAINER),true) release: $(RUN) hack/make-rules/release.sh $(WHAT) $(ARM_VERSION) $(OS) +else ifeq ($(OS),windows) +release: + sudo apt-get install -y mingw-w64 + hack/make-rules/release.sh $(WHAT) $(ARM_VERSION) $(OS) else release: sudo apt-get install -y mingw-w64 |