Compare commits
3 Commits
0.2.14
..
a731b62a52
| Author | SHA1 | Date | |
|---|---|---|---|
| a731b62a52 | |||
| 15e8cdc562 | |||
| 6113f9744c |
@@ -27,17 +27,56 @@ jobs:
|
|||||||
version: ${{ steps.set-outputs.outputs.version }}
|
version: ${{ steps.set-outputs.outputs.version }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
repository: niko/gitea-ci-library
|
|
||||||
path: .ci
|
|
||||||
|
|
||||||
- name: Check existing artifact and calculate version
|
- name: Check existing artifact and calculate version
|
||||||
env:
|
run: |
|
||||||
SERVER_URL: ${{ gitea.server_url }}
|
if [ -n "${VERSION_FILE}" ]; then
|
||||||
REPO: ${{ github.repository }}
|
if echo "${VERSION_FILE}" | grep -q '\.json$'; then
|
||||||
SHA: ${{ github.sha }}
|
RAW_VERSION=$(jq -r '.version' "${VERSION_FILE}")
|
||||||
run: bash .ci/scripts/check-version.sh
|
elif echo "${VERSION_FILE}" | grep -q -E '\.ya?ml$'; then
|
||||||
|
RAW_VERSION=$(grep -oP '^version:\s*\K\S+' "${VERSION_FILE}")
|
||||||
|
else
|
||||||
|
RAW_VERSION=$(cat "${VERSION_FILE}" | tr -d '[:space:]')
|
||||||
|
fi
|
||||||
|
elif [ -f VERSION ]; then
|
||||||
|
RAW_VERSION=$(cat VERSION | tr -d '[:space:]')
|
||||||
|
elif [ -f package.json ]; then
|
||||||
|
RAW_VERSION=$(jq -r '.version' package.json)
|
||||||
|
elif [ -f pom.xml ]; then
|
||||||
|
RAW_VERSION=$(grep -oP '<version>\K[^<]+' pom.xml | head -1)
|
||||||
|
else
|
||||||
|
echo "ERROR: No VERSION file, package.json, Chart.yaml or pom.xml found" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
BASE_VERSION=$(echo "$RAW_VERSION" | cut -d'.' -f1-2)
|
||||||
|
echo "gitea-ci-library - Tunnistettu Major.Minor versio: $BASE_VERSION"
|
||||||
|
|
||||||
|
TAGS_JSON=$(curl -s -f -H "Authorization: token $GITEA_TOKEN" \
|
||||||
|
"${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/tags")
|
||||||
|
|
||||||
|
TAG=$(echo "$TAGS_JSON" | jq -r --arg prefix "${GIT_TAG_PREFIX}" '
|
||||||
|
if type == "array" then
|
||||||
|
.[] | select(.commit.sha == "${{ github.sha }}" and (.name | startswith($prefix))) | .name
|
||||||
|
else empty end' | head -1)
|
||||||
|
|
||||||
|
mkdir -p /tmp/build-ctx
|
||||||
|
|
||||||
|
if [ -n "$TAG" ]; then
|
||||||
|
echo "ARTIFACT_EXISTS=true" > /tmp/build-ctx/build.env
|
||||||
|
echo "NEXT_VERSION=$TAG" >> /tmp/build-ctx/build.env
|
||||||
|
echo "gitea-ci-library - Artefakti löytyi jo tagilla: $TAG."
|
||||||
|
else
|
||||||
|
echo "ARTIFACT_EXISTS=false" > /tmp/build-ctx/build.env
|
||||||
|
|
||||||
|
HIGHEST_PATCH=$(echo "$TAGS_JSON" | jq -r --arg prefix "${GIT_TAG_PREFIX}" --arg bv "${GIT_TAG_PREFIX}${BASE_VERSION}." '
|
||||||
|
if type == "array" then .[] | .name | select(startswith($bv)) | sub($bv; "") | tonumber else empty end' | sort -rn | head -1)
|
||||||
|
|
||||||
|
if [ -z "$HIGHEST_PATCH" ]; then NEXT_PATCH=0; else NEXT_PATCH=$((HIGHEST_PATCH + 1)); fi
|
||||||
|
FULL_VERSION="${BASE_VERSION}.${NEXT_PATCH}"
|
||||||
|
|
||||||
|
echo "NEXT_VERSION=$FULL_VERSION" >> /tmp/build-ctx/build.env
|
||||||
|
echo "gitea-ci-library - Uusi vapaa versio: $FULL_VERSION"
|
||||||
|
fi
|
||||||
|
|
||||||
- name: Set job outputs
|
- name: Set job outputs
|
||||||
id: set-outputs
|
id: set-outputs
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- fix/helm-build-node
|
- feature/helm-chart
|
||||||
paths:
|
paths:
|
||||||
- git-pages/**
|
- git-pages/**
|
||||||
- .gitea/workflows/helm-build-push.yml
|
- .gitea/workflows/helm-build-push.yml
|
||||||
|
|||||||
@@ -39,12 +39,6 @@ jobs:
|
|||||||
container:
|
container:
|
||||||
image: alpine/helm:3.19.0
|
image: alpine/helm:3.19.0
|
||||||
steps:
|
steps:
|
||||||
- name: Install Node.js for actions/checkout
|
|
||||||
# COMPROMISE: Requires internet access.
|
|
||||||
# Does NOT work in air-gapped environments.
|
|
||||||
# Replace with a custom image (e.g., extending alpine/helm + nodejs) if needed.
|
|
||||||
run: apk add --no-cache nodejs
|
|
||||||
|
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
|
|||||||
+2
-2
@@ -68,8 +68,8 @@ open "https://gitea.app.keskikuja.site/${REPO_OWNER}/${REPO_NAME}/settings/actio
|
|||||||
|
|
||||||
> 💡 **Monelle repoille:** Toista vaiheet 3–4, tai katso [automatisointi](docs/secrets.md#automatisointi-useamman-repon-salaisuuden-lis%C3%A4%C3%A4miseen).
|
> 💡 **Monelle repoille:** Toista vaiheet 3–4, tai katso [automatisointi](docs/secrets.md#automatisointi-useamman-repon-salaisuuden-lis%C3%A4%C3%A4miseen).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Käyttöönotto
|
## Käyttöönotto
|
||||||
|
|
||||||
### 1. Secretit
|
### 1. Secretit
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
RAW_VERSION=""
|
|
||||||
|
|
||||||
if [ -n "${VERSION_FILE-}" ] && [ -f "${VERSION_FILE-}" ]; then
|
|
||||||
RAW_VERSION=$(sed -n 's/^version:[[:space:]]*\([^[:space:]]*\).*/\1/p' "${VERSION_FILE}")
|
|
||||||
if [ -z "${RAW_VERSION}" ]; then
|
|
||||||
if echo "${VERSION_FILE}" | grep -q -E '\.json$'; then
|
|
||||||
RAW_VERSION=$(jq -r '.version' "${VERSION_FILE}")
|
|
||||||
else
|
|
||||||
RAW_VERSION=$(cat "${VERSION_FILE}" | tr -d '[:space:]')
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${RAW_VERSION}" ]; then
|
|
||||||
if [ -f VERSION ]; then
|
|
||||||
RAW_VERSION=$(cat VERSION | tr -d '[:space:]')
|
|
||||||
elif [ -f package.json ]; then
|
|
||||||
RAW_VERSION=$(jq -r '.version' package.json)
|
|
||||||
elif [ -f pom.xml ]; then
|
|
||||||
RAW_VERSION=$(grep -oP '<version>\K[^<]+' pom.xml | head -1)
|
|
||||||
elif [ -f Chart.yaml ]; then
|
|
||||||
RAW_VERSION=$(sed -n 's/^version:[[:space:]]*\([^[:space:]]*\).*/\1/p' Chart.yaml)
|
|
||||||
else
|
|
||||||
echo "ERROR: No version source found (VERSION_FILE, VERSION, package.json, pom.xml, Chart.yaml)" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
BASE_VERSION=$(echo "$RAW_VERSION" | cut -d'.' -f1-2)
|
|
||||||
echo "gitea-ci-library - Tunnistettu Major.Minor versio: $BASE_VERSION"
|
|
||||||
|
|
||||||
TAGS_JSON=$(curl -s -f -H "Authorization: token ${GITEA_TOKEN}" \
|
|
||||||
"${SERVER_URL}/api/v1/repos/${REPO}/tags")
|
|
||||||
|
|
||||||
TAG=$(echo "$TAGS_JSON" | jq -r --arg prefix "${GIT_TAG_PREFIX-}" --arg sha "${SHA}" '
|
|
||||||
if type == "array" then
|
|
||||||
.[] | select(.commit.sha == $sha and (.name | startswith($prefix))) | .name
|
|
||||||
else empty end' | head -1)
|
|
||||||
|
|
||||||
mkdir -p /tmp/build-ctx
|
|
||||||
|
|
||||||
if [ -n "$TAG" ]; then
|
|
||||||
echo "ARTIFACT_EXISTS=true" > /tmp/build-ctx/build.env
|
|
||||||
echo "NEXT_VERSION=$TAG" >> /tmp/build-ctx/build.env
|
|
||||||
echo "gitea-ci-library - Artefakti löytyi jo tagilla: $TAG."
|
|
||||||
else
|
|
||||||
echo "ARTIFACT_EXISTS=false" > /tmp/build-ctx/build.env
|
|
||||||
|
|
||||||
HIGHEST_PATCH=$(echo "$TAGS_JSON" | jq -r --arg prefix "${GIT_TAG_PREFIX-}" --arg bv "${GIT_TAG_PREFIX-}${BASE_VERSION}." '
|
|
||||||
if type == "array" then .[] | .name | select(startswith($bv)) | sub($bv; "") | tonumber else empty end' | sort -rn | head -1)
|
|
||||||
|
|
||||||
if [ -z "$HIGHEST_PATCH" ]; then NEXT_PATCH=0; else NEXT_PATCH=$((HIGHEST_PATCH + 1)); fi
|
|
||||||
FULL_VERSION="${BASE_VERSION}.${NEXT_PATCH}"
|
|
||||||
|
|
||||||
echo "NEXT_VERSION=$FULL_VERSION" >> /tmp/build-ctx/build.env
|
|
||||||
echo "gitea-ci-library - Uusi vapaa versio: $FULL_VERSION"
|
|
||||||
fi
|
|
||||||
@@ -1,167 +0,0 @@
|
|||||||
#!/usr/bin/env bats
|
|
||||||
|
|
||||||
source "$BATS_TEST_DIRNAME/helpers/mock-api.sh"
|
|
||||||
|
|
||||||
setup() {
|
|
||||||
export GITEA_TOKEN=test-token
|
|
||||||
export GIT_TAG_PREFIX=""
|
|
||||||
export SERVER_URL="http://localhost:18080"
|
|
||||||
export REPO="niko/test"
|
|
||||||
export SHA="abc123"
|
|
||||||
rm -rf /tmp/build-ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
teardown() {
|
|
||||||
mock_stop 2>/dev/null || true
|
|
||||||
rm -rf /tmp/build-ctx
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "VERSION_FILE=Chart.yaml extracts version from YAML" {
|
|
||||||
mock_set_sequence '[{"code": 200, "body": []}]'
|
|
||||||
mock_start
|
|
||||||
|
|
||||||
export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/Chart.yaml"
|
|
||||||
run bash scripts/check-version.sh
|
|
||||||
|
|
||||||
[ "$status" -eq 0 ]
|
|
||||||
source /tmp/build-ctx/build.env
|
|
||||||
[ "$ARTIFACT_EXISTS" = "false" ]
|
|
||||||
[ "$NEXT_VERSION" = "0.3.0" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "VERSION_FILE=VERSION extracts version from plain text" {
|
|
||||||
mock_set_sequence '[{"code": 200, "body": []}]'
|
|
||||||
mock_start
|
|
||||||
|
|
||||||
export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/VERSION"
|
|
||||||
run bash scripts/check-version.sh
|
|
||||||
|
|
||||||
[ "$status" -eq 0 ]
|
|
||||||
source /tmp/build-ctx/build.env
|
|
||||||
[ "$ARTIFACT_EXISTS" = "false" ]
|
|
||||||
[ "$NEXT_VERSION" = "0.3.0" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "VERSION_FILE=package.json extracts version from JSON" {
|
|
||||||
mock_set_sequence '[{"code": 200, "body": []}]'
|
|
||||||
mock_start
|
|
||||||
|
|
||||||
export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/package.json"
|
|
||||||
run bash scripts/check-version.sh
|
|
||||||
|
|
||||||
[ "$status" -eq 0 ]
|
|
||||||
source /tmp/build-ctx/build.env
|
|
||||||
[ "$ARTIFACT_EXISTS" = "false" ]
|
|
||||||
[ "$NEXT_VERSION" = "0.3.0" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "VERSION_FILE=subdir/Chart.yaml extracts version from monorepo" {
|
|
||||||
mock_set_sequence '[{"code": 200, "body": []}]'
|
|
||||||
mock_start
|
|
||||||
|
|
||||||
export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/subdir/Chart.yaml"
|
|
||||||
run bash scripts/check-version.sh
|
|
||||||
|
|
||||||
[ "$status" -eq 0 ]
|
|
||||||
source /tmp/build-ctx/build.env
|
|
||||||
[ "$ARTIFACT_EXISTS" = "false" ]
|
|
||||||
[ "$NEXT_VERSION" = "0.4.0" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "no VERSION_FILE, root VERSION found" {
|
|
||||||
mock_set_sequence '[{"code": 200, "body": []}]'
|
|
||||||
mock_start
|
|
||||||
|
|
||||||
WORKDIR=$(mktemp -d)
|
|
||||||
cp "$BATS_TEST_DIRNAME/fixtures/check-version/VERSION" "$WORKDIR/VERSION"
|
|
||||||
|
|
||||||
SCRIPT="$PWD/scripts/check-version.sh"
|
|
||||||
run bash -c "cd '$WORKDIR' && exec bash '$SCRIPT'"
|
|
||||||
|
|
||||||
rm -rf "$WORKDIR"
|
|
||||||
[ "$status" -eq 0 ]
|
|
||||||
source /tmp/build-ctx/build.env
|
|
||||||
[ "$NEXT_VERSION" = "0.3.0" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "no VERSION_FILE, root Chart.yaml found" {
|
|
||||||
mock_set_sequence '[{"code": 200, "body": []}]'
|
|
||||||
mock_start
|
|
||||||
|
|
||||||
WORKDIR=$(mktemp -d)
|
|
||||||
cp "$BATS_TEST_DIRNAME/fixtures/check-version/Chart.yaml" "$WORKDIR/Chart.yaml"
|
|
||||||
|
|
||||||
SCRIPT="$PWD/scripts/check-version.sh"
|
|
||||||
run bash -c "cd '$WORKDIR' && exec bash '$SCRIPT'"
|
|
||||||
|
|
||||||
rm -rf "$WORKDIR"
|
|
||||||
[ "$status" -eq 0 ]
|
|
||||||
source /tmp/build-ctx/build.env
|
|
||||||
[ "$NEXT_VERSION" = "0.3.0" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "tag exists for commit sets ARTIFACT_EXISTS=true" {
|
|
||||||
mock_set_sequence '[{"code": 200, "body": [{"name": "0.3.0", "commit": {"sha": "abc123"}}]}]'
|
|
||||||
mock_start
|
|
||||||
|
|
||||||
export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/VERSION"
|
|
||||||
run bash scripts/check-version.sh
|
|
||||||
|
|
||||||
[ "$status" -eq 0 ]
|
|
||||||
source /tmp/build-ctx/build.env
|
|
||||||
[ "$ARTIFACT_EXISTS" = "true" ]
|
|
||||||
[ "$NEXT_VERSION" = "0.3.0" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "tag with prefix filters correctly" {
|
|
||||||
mock_set_sequence '[{"code": 200, "body": [{"name": "git-pages/0.3.0", "commit": {"sha": "abc123"}}, {"name": "docker/0.3.0", "commit": {"sha": "abc123"}}]}]'
|
|
||||||
mock_start
|
|
||||||
|
|
||||||
export GIT_TAG_PREFIX="git-pages/"
|
|
||||||
export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/VERSION"
|
|
||||||
run bash scripts/check-version.sh
|
|
||||||
|
|
||||||
[ "$status" -eq 0 ]
|
|
||||||
source /tmp/build-ctx/build.env
|
|
||||||
[ "$ARTIFACT_EXISTS" = "true" ]
|
|
||||||
[ "$NEXT_VERSION" = "git-pages/0.3.0" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "no tag, new version calculated" {
|
|
||||||
mock_set_sequence '[{"code": 200, "body": []}]'
|
|
||||||
mock_start
|
|
||||||
|
|
||||||
export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/VERSION"
|
|
||||||
run bash scripts/check-version.sh
|
|
||||||
|
|
||||||
[ "$status" -eq 0 ]
|
|
||||||
source /tmp/build-ctx/build.env
|
|
||||||
[ "$ARTIFACT_EXISTS" = "false" ]
|
|
||||||
[ "$NEXT_VERSION" = "0.3.0" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "highest patch calculated correctly" {
|
|
||||||
mock_set_sequence '[{"code": 200, "body": [{"name": "0.3.0", "commit": {"sha": "def456"}}, {"name": "0.3.1", "commit": {"sha": "def456"}}]}]'
|
|
||||||
mock_start
|
|
||||||
|
|
||||||
export VERSION_FILE="$BATS_TEST_DIRNAME/fixtures/check-version/VERSION"
|
|
||||||
run bash scripts/check-version.sh
|
|
||||||
|
|
||||||
[ "$status" -eq 0 ]
|
|
||||||
source /tmp/build-ctx/build.env
|
|
||||||
[ "$ARTIFACT_EXISTS" = "false" ]
|
|
||||||
[ "$NEXT_VERSION" = "0.3.2" ]
|
|
||||||
}
|
|
||||||
|
|
||||||
@test "no version source exits with error" {
|
|
||||||
mock_set_sequence '[{"code": 200, "body": []}]'
|
|
||||||
mock_start
|
|
||||||
|
|
||||||
WORKDIR=$(mktemp -d)
|
|
||||||
SCRIPT="$PWD/scripts/check-version.sh"
|
|
||||||
run bash -c "cd '$WORKDIR' && exec bash '$SCRIPT'"
|
|
||||||
|
|
||||||
rm -rf "$WORKDIR"
|
|
||||||
[ "$status" -eq 1 ]
|
|
||||||
[[ "$output" == *"ERROR"* ]]
|
|
||||||
}
|
|
||||||
-6
@@ -1,6 +0,0 @@
|
|||||||
apiVersion: v2
|
|
||||||
name: test-chart
|
|
||||||
description: Test chart for version extraction
|
|
||||||
type: application
|
|
||||||
version: 0.3.0
|
|
||||||
appVersion: "1.0.0"
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
0.3.0
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
{"version": "0.3.0"}
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
<project><version>0.3.0</version></project>
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
apiVersion: v2
|
|
||||||
name: subdir-chart
|
|
||||||
description: Chart in subdirectory for monorepo testing
|
|
||||||
type: application
|
|
||||||
version: 0.4.0
|
|
||||||
appVersion: "1.0.0"
|
|
||||||
Reference in New Issue
Block a user