You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2021/11/23 08:23:54 UTC
[apisix] 01/01: ci: fix the broken VERSION env
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch fvra
in repository https://gitbox.apache.org/repos/asf/apisix.git
commit 5f4d6876d4500fbbfa8e5af9ab16cc04f58d2785
Author: spacewander <sp...@gmail.com>
AuthorDate: Tue Nov 23 16:21:33 2021 +0800
ci: fix the broken VERSION env
The env name is changed by accident during the Makefile refactor
---
.github/workflows/build.yml | 2 +-
Makefile | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ba20b60..7f94726 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,7 +69,7 @@ jobs:
- name: Create tarball
if: ${{ startsWith(github.ref, 'refs/heads/release/') }}
run: |
- make compress-tar project_version=${{ steps.branch_env.outputs.version }}
+ make compress-tar VERSION=${{ steps.branch_env.outputs.version }}
- name: Remove source code
if: ${{ startsWith(github.ref, 'refs/heads/release/') }}
diff --git a/Makefile b/Makefile
index c993ffe..22e647c 100644
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,10 @@ SHELL := /bin/bash -o pipefail
# Project basic setting
+VERSION ?= master
project_name ?= apache-apisix
-project_version ?= master
project_compose_ci ?= ci/pod/docker-compose.yml
-project_release_name ?= $(project_name)-$(project_version)-src
+project_release_name ?= $(project_name)-$(VERSION)-src
# Hyperconverged Infrastructure
@@ -365,11 +365,13 @@ release-src: compress-tar
.PHONY: compress-tar
compress-tar:
+ # The $VERSION can be major.minor.patch (from developer)
+ # or major.minor (from the branch name in the CI)
$(ENV_TAR) -zcvf $(project_release_name).tgz \
./apisix \
./bin \
./conf \
- ./rockspec/apisix-$(project_version)-*.rockspec \
+ ./rockspec/apisix-$(project_version)*.rockspec \
./rockspec/apisix-master-0.rockspec \
LICENSE \
Makefile \