From 983b99f907d0e6e63732cd5d606940cabd565947 Mon Sep 17 00:00:00 2001 From: edraft Date: Fri, 18 Apr 2025 14:02:50 +0200 Subject: [PATCH] Fixed build --- .gitea/workflows/build dev.yaml | 16 ++++++---------- .gitea/workflows/build.yaml | 15 ++++++--------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.gitea/workflows/build dev.yaml b/.gitea/workflows/build dev.yaml index b7aab73..2ff0e32 100644 --- a/.gitea/workflows/build dev.yaml +++ b/.gitea/workflows/build dev.yaml @@ -17,7 +17,7 @@ jobs: - name: Get Date and Build Number run: | - git fetch + git fetch --tags git tag DATE=$(date +'%Y.%m.%d') TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l) @@ -38,7 +38,6 @@ jobs: uses: actions/upload-artifact@v3 with: name: version - path: version.txt build-api: runs-on: [runner] @@ -54,12 +53,11 @@ jobs: uses: actions/download-artifact@v3 with: name: version - path: version.txt - name: Build docker run: | cd api - echo "VERSION = \"$(cat version.txt)\"" > version.py + echo "VERSION = \"$(cat ../version.txt)\"" > version.py docker build --no-cache -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt) . - name: Login to registry git.sh-edraft.de @@ -71,7 +69,7 @@ jobs: - name: Push image run: | - docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat version.txt) + docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt) build-redirector: runs-on: [runner] @@ -87,7 +85,6 @@ jobs: uses: actions/download-artifact@v3 with: name: version - path: version.txt - name: Build docker run: | @@ -103,7 +100,7 @@ jobs: - name: Push image run: | - docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat version.txt) + docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat ../version.txt) build-web: runs-on: [runner] @@ -119,7 +116,6 @@ jobs: uses: actions/download-artifact@v3 with: name: version - path: version.txt - name: Prepare web build run: | @@ -134,7 +130,7 @@ jobs: - name: Build docker run: | cd web - docker build --no-cache --build-arg VERSION=$(cat version.txt) -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) . + docker build --no-cache --build-arg VERSION=$(cat ../version.txt) -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) . - name: Login to registry git.sh-edraft.de uses: https://github.com/docker/login-action@v1 @@ -145,4 +141,4 @@ jobs: - name: Push image run: | - docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat version.txt) + docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 5990a07..c9eccf9 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -17,7 +17,7 @@ jobs: - name: Get Date and Build Number run: | - git fetch + git fetch --tags git tag DATE=$(date +'%Y.%m.%d') TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l) @@ -38,7 +38,6 @@ jobs: uses: actions/upload-artifact@v3 with: name: version - path: version.txt build-api: runs-on: [runner] @@ -58,7 +57,7 @@ jobs: - name: Build docker run: | cd api - echo "VERSION = \"$(cat version.txt)\"" > version.py + echo "VERSION = \"$(cat ../version.txt)\"" > version.py docker build --no-cache -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt) . - name: Login to registry git.sh-edraft.de @@ -70,7 +69,7 @@ jobs: - name: Push image run: | - docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat version.txt) + docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt) build-redirector: runs-on: [runner] @@ -86,7 +85,6 @@ jobs: uses: actions/download-artifact@v3 with: name: version - path: version.txt - name: Build docker run: | @@ -102,7 +100,7 @@ jobs: - name: Push image run: | - docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat version.txt) + docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat ../version.txt) build-web: runs-on: [runner] @@ -118,7 +116,6 @@ jobs: uses: actions/download-artifact@v3 with: name: version - path: version.txt - name: Prepare web build run: | @@ -133,7 +130,7 @@ jobs: - name: Build docker run: | cd web - docker build --no-cache --build-arg VERSION=$(cat version.txt) -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) . + docker build --no-cache --build-arg VERSION=$(cat ../version.txt) -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) . - name: Login to registry git.sh-edraft.de uses: https://github.com/docker/login-action@v1 @@ -144,4 +141,4 @@ jobs: - name: Push image run: | - docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat version.txt) + docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt)