From ef17f800b1c0db2b8999ecd98beba165a84c80be Mon Sep 17 00:00:00 2001 From: edraft Date: Fri, 17 Jan 2025 19:45:18 +0100 Subject: [PATCH] New version format --- .gitea/workflows/build dev.yaml | 68 ++++++++++++++++++++++++++++----- .gitea/workflows/build.yaml | 54 +++++++++++++++++++++++++- version.txt | 1 - 3 files changed, 111 insertions(+), 12 deletions(-) delete mode 100644 version.txt diff --git a/.gitea/workflows/build dev.yaml b/.gitea/workflows/build dev.yaml index 1ab0ca0..a5f12eb 100644 --- a/.gitea/workflows/build dev.yaml +++ b/.gitea/workflows/build dev.yaml @@ -1,13 +1,45 @@ -name: Build dev on push -run-name: Build dev on push +name: Build on push +run-name: Build on push on: push: branches: - dev jobs: + prepare: + runs-on: [runner] + container: git.sh-edraft.de/sh-edraft.de/act-runner:latest + steps: + - name: Clone Repository + uses: https://github.com/actions/checkout@v3 + with: + token: ${{ secrets.CI_ACCESS_TOKEN }} + + - name: Get Date and Build Number + run: | + DATE=$(date +'%Y.%m.%d') + git fetch --tags + TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l) + BUILD_NUMBER=$(($TAG_COUNT + 1)) + BUILD_VERSION="${DATE}.${BUILD_NUMBER}-dev" + echo "$BUILD_VERSION" > version.txt + + - name: Create Git Tag for Build + run: | + git config user.name "ci" + git config user.email "dev@sh-edratf.de" + git tag ${{ env.BUILD_VERSION }} + git push origin ${{ env.BUILD_VERSION }} + + - name: Upload build version artifact + uses: actions/upload-artifact@v3 + with: + name: version + path: version.txt + build-api: runs-on: [runner] + needs: prepare container: git.sh-edraft.de/sh-edraft.de/act-runner:latest steps: - name: Clone Repository @@ -15,10 +47,16 @@ jobs: with: token: ${{ secrets.CI_ACCESS_TOKEN }} + - name: Download build version artifact + uses: actions/download-artifact@v3 + with: + name: version + - name: Build docker run: | cd api - docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-api-dev:$(cat ../version.txt) . + echo "VERSION = \"$(cat version.txt)\"" > version.py + docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt) . - name: Login to registry git.sh-edraft.de uses: https://github.com/docker/login-action@v1 @@ -29,10 +67,11 @@ jobs: - name: Push image run: | - docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api-dev:$(cat version.txt) - + docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat version.txt) + build-redirector: runs-on: [runner] + needs: prepare container: git.sh-edraft.de/sh-edraft.de/act-runner:latest steps: - name: Clone Repository @@ -40,10 +79,15 @@ jobs: with: token: ${{ secrets.CI_ACCESS_TOKEN }} + - name: Download build version artifact + uses: actions/download-artifact@v3 + with: + name: version + - name: Build docker run: | cd api - docker build -f dockerfile_redirector -t git.sh-edraft.de/sh-edraft.de/open-redirect-redirector-dev:$(cat ../version.txt) . + docker build -f dockerfile_redirector -t git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat ../version.txt) . - name: Login to registry git.sh-edraft.de uses: https://github.com/docker/login-action@v1 @@ -54,10 +98,11 @@ jobs: - name: Push image run: | - docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector-dev:$(cat version.txt) + docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat version.txt) build-web: runs-on: [runner] + needs: prepare container: git.sh-edraft.de/sh-edraft.de/act-runner:latest steps: - name: Clone Repository @@ -65,6 +110,11 @@ jobs: with: token: ${{ secrets.CI_ACCESS_TOKEN }} + - name: Download build version artifact + uses: actions/download-artifact@v3 + with: + name: version + - name: Prepare web build run: | cd web @@ -78,7 +128,7 @@ jobs: - name: Build docker run: | cd web - docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-web-dev:$(cat ../version.txt) . + docker build -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 @@ -89,4 +139,4 @@ jobs: - name: Push image run: | - docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web-dev:$(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 1d48b26..c3c0f7d 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -6,7 +6,7 @@ on: - master jobs: - build-api: + prepare: runs-on: [runner] container: git.sh-edraft.de/sh-edraft.de/act-runner:latest steps: @@ -15,9 +15,47 @@ jobs: with: token: ${{ secrets.CI_ACCESS_TOKEN }} + - name: Get Date and Build Number + run: | + DATE=$(date +'%Y.%m.%d') + git fetch --tags + TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l) + BUILD_NUMBER=$(($TAG_COUNT + 1)) + BUILD_VERSION="${DATE}.${BUILD_NUMBER}" + echo "$BUILD_VERSION" > version.txt + + - name: Create Git Tag for Build + run: | + git config user.name "ci" + git config user.email "dev@sh-edratf.de" + git tag ${{ env.BUILD_VERSION }} + git push origin ${{ env.BUILD_VERSION }} + + - name: Upload build version artifact + uses: actions/upload-artifact@v3 + with: + name: version + path: version.txt + + build-api: + runs-on: [runner] + needs: prepare + container: git.sh-edraft.de/sh-edraft.de/act-runner:latest + steps: + - name: Clone Repository + uses: https://github.com/actions/checkout@v3 + with: + token: ${{ secrets.CI_ACCESS_TOKEN }} + + - name: Download build version artifact + uses: actions/download-artifact@v3 + with: + name: version + - name: Build docker run: | cd api + echo "VERSION = \"$(cat version.txt)\"" > version.py docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt) . - name: Login to registry git.sh-edraft.de @@ -30,9 +68,10 @@ jobs: - name: Push image run: | docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat version.txt) - + build-redirector: runs-on: [runner] + needs: prepare container: git.sh-edraft.de/sh-edraft.de/act-runner:latest steps: - name: Clone Repository @@ -40,6 +79,11 @@ jobs: with: token: ${{ secrets.CI_ACCESS_TOKEN }} + - name: Download build version artifact + uses: actions/download-artifact@v3 + with: + name: version + - name: Build docker run: | cd api @@ -58,6 +102,7 @@ jobs: build-web: runs-on: [runner] + needs: prepare container: git.sh-edraft.de/sh-edraft.de/act-runner:latest steps: - name: Clone Repository @@ -65,6 +110,11 @@ jobs: with: token: ${{ secrets.CI_ACCESS_TOKEN }} + - name: Download build version artifact + uses: actions/download-artifact@v3 + with: + name: version + - name: Prepare web build run: | cd web diff --git a/version.txt b/version.txt deleted file mode 100644 index cb174d5..0000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -1.2.1 \ No newline at end of file