kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
fix: Remove variable overrides
Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2698>environments/review-docs-renov-r6aeyi/deployments/19166
rodzic
fa6d48f1b7
commit
b4f18edaff
13
Makefile
13
Makefile
|
@ -18,12 +18,11 @@ docker-build: docker-metadata
|
|||
build-metadata:
|
||||
./scripts/build_metadata.py --format env | tee build_metadata.env
|
||||
|
||||
VERSION ?= $(shell git describe --tags --abbrev=0)
|
||||
BUILD_DIR = dist
|
||||
package:
|
||||
rm -Rf $(BUILD_DIR)
|
||||
mkdir -p $(BUILD_DIR)
|
||||
tar --create --gunzip --file='$(BUILD_DIR)/funkwhale-api-$(VERSION).tar.gz' \
|
||||
tar --create --gunzip --file='$(BUILD_DIR)/funkwhale-api.tar.gz' \
|
||||
--owner='root' \
|
||||
--group='root' \
|
||||
--exclude-vcs \
|
||||
|
@ -36,11 +35,11 @@ package:
|
|||
api/Readme.md
|
||||
|
||||
cd '$(BUILD_DIR)' && \
|
||||
tar --extract --gunzip --file='funkwhale-api-$(VERSION).tar.gz' && \
|
||||
zip -q 'funkwhale-api-$(VERSION).zip' -r api && \
|
||||
tar --extract --gunzip --file='funkwhale-api.tar.gz' && \
|
||||
zip -q 'funkwhale-api.zip' -r api && \
|
||||
rm -Rf api
|
||||
|
||||
tar --create --gunzip --file='$(BUILD_DIR)/funkwhale-front-$(VERSION).tar.gz' \
|
||||
tar --create --gunzip --file='$(BUILD_DIR)/funkwhale-front.tar.gz' \
|
||||
--owner='root' \
|
||||
--group='root' \
|
||||
--exclude-vcs \
|
||||
|
@ -48,8 +47,8 @@ package:
|
|||
front/dist
|
||||
|
||||
cd '$(BUILD_DIR)' && \
|
||||
tar --extract --gunzip --file='funkwhale-front-$(VERSION).tar.gz' && \
|
||||
zip -q 'funkwhale-front-$(VERSION).zip' -r front && \
|
||||
tar --extract --gunzip --file='funkwhale-front.tar.gz' && \
|
||||
zip -q 'funkwhale-front.zip' -r front && \
|
||||
rm -Rf front
|
||||
|
||||
cd '$(BUILD_DIR)' && sha256sum * > SHA256SUMS
|
||||
|
|
|
@ -12,11 +12,6 @@ error() {
|
|||
|
||||
command -v curl > /dev/null || error "curl command not found!"
|
||||
|
||||
CI_API_V4_URL="https://dev.funkwhale.audio/api/v4"
|
||||
CI_PROJECT_ID="955"
|
||||
CI_COMMIT_REF_NAME="1.3.0-rc4"
|
||||
CI_JOB_TOKEN="glpat-GyMCY55RP2D_pGjqnkKe"
|
||||
|
||||
PACKAGE_REGISTRY_URL="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic"
|
||||
PACKAGE_NAME="funkwhale"
|
||||
PACKAGE_VERSION="$CI_COMMIT_REF_NAME"
|
||||
|
|
Ładowanie…
Reference in New Issue