MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Remove variable overrides 

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2698>
This commit is contained in:
Georg Krause 2024-01-05 11:39:33 +00:00
parent fa6d48f1b7
commit b4f18edaff
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -18,12 +18,11 @@ docker-build: docker-metadata
build-metadata: build-metadata:
./scripts/build_metadata.py --format env | tee build_metadata.env ./scripts/build_metadata.py --format env | tee build_metadata.env
VERSION ?= $(shell git describe --tags --abbrev=0)
BUILD_DIR = dist BUILD_DIR = dist
package: package:
rm -Rf $(BUILD_DIR) rm -Rf $(BUILD_DIR)
mkdir -p $(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' \ --owner='root' \
--group='root' \ --group='root' \
--exclude-vcs \ --exclude-vcs \
@ -36,11 +35,11 @@ package:
api/Readme.md api/Readme.md
cd '$(BUILD_DIR)' && \ cd '$(BUILD_DIR)' && \
tar --extract --gunzip --file='funkwhale-api-$(VERSION).tar.gz' && \ tar --extract --gunzip --file='funkwhale-api.tar.gz' && \
zip -q 'funkwhale-api-$(VERSION).zip' -r api && \ zip -q 'funkwhale-api.zip' -r api && \
rm -Rf 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' \ --owner='root' \
--group='root' \ --group='root' \
--exclude-vcs \ --exclude-vcs \
@ -48,8 +47,8 @@ package:
front/dist front/dist
cd '$(BUILD_DIR)' && \ cd '$(BUILD_DIR)' && \
tar --extract --gunzip --file='funkwhale-front-$(VERSION).tar.gz' && \ tar --extract --gunzip --file='funkwhale-front.tar.gz' && \
zip -q 'funkwhale-front-$(VERSION).zip' -r front && \ zip -q 'funkwhale-front.zip' -r front && \
rm -Rf front rm -Rf front
cd '$(BUILD_DIR)' && sha256sum * > SHA256SUMS cd '$(BUILD_DIR)' && sha256sum * > SHA256SUMS

5
scripts/ci-upload-packages.sh
View File

@ -12,11 +12,6 @@ error() {
command -v curl > /dev/null || error "curl command not found!" 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_REGISTRY_URL="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic"
PACKAGE_NAME="funkwhale" PACKAGE_NAME="funkwhale"
PACKAGE_VERSION="$CI_COMMIT_REF_NAME" PACKAGE_VERSION="$CI_COMMIT_REF_NAME"