diff --git a/.gitea/workflows/build_dev.yaml b/.gitea/workflows/build_dev.yaml index fc1b35a7..4343533c 100644 --- a/.gitea/workflows/build_dev.yaml +++ b/.gitea/workflows/build_dev.yaml @@ -15,15 +15,13 @@ jobs: core: needs: prepare uses: ./.gitea/workflows/package.yaml - defaults: - run: - working-directory: src/cpl_core + with: + working_directory: src/cpl_core secrets: inherit query: needs: prepare uses: ./.gitea/workflows/package.yaml - defaults: - run: - working-directory: src/cpl_query + with: + working_directory: src/cpl_query secrets: inherit \ No newline at end of file diff --git a/.gitea/workflows/package.yaml b/.gitea/workflows/package.yaml index e802e0f9..a6ea9129 100644 --- a/.gitea/workflows/package.yaml +++ b/.gitea/workflows/package.yaml @@ -8,12 +8,17 @@ on: description: 'Suffix for version (z.B. "dev", "alpha", "beta")' required: false type: string + working_directory: + required: true + type: string jobs: build: runs-on: [ runner ] container: git.sh-edraft.de/sh-edraft.de/act-runner:latest - + defaults: + run: + working-directory: ${{ inputs.working_directory }} steps: - name: Clone Repository uses: https://github.com/actions/checkout@v3 @@ -29,7 +34,14 @@ jobs: run: | VERSION_SUFFIX="${{ inputs.version_suffix }}" if [ -n "$VERSION_SUFFIX" ]; then - sed -i -E "s/^version = \".*\"/version = \"$(cat version.txt)-$VERSION_SUFFIX\"/" pyproject.toml + if [[ "$VERSION_SUFFIX" == "dev"* ]]; then + BASE_VERSION=$(cat version.txt | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+\.)([0-9]+)/\1/') + DEV_NUMBER=$(echo "$VERSION_SUFFIX" | sed -E 's/dev([0-9]*)/\1/') + DEV_NUMBER=${DEV_NUMBER:-1} + sed -i -E "s/^version = \".*\"/version = \"${BASE_VERSION}dev${DEV_NUMBER}\"/" pyproject.toml + else + sed -i -E "s/^version = \".*\"/version = \"$(cat version.txt)-$VERSION_SUFFIX\"/" pyproject.toml + fi else sed -i -E "s/^version = \".*\"/version = \"$(cat version.txt)\"/" pyproject.toml fi @@ -40,7 +52,7 @@ jobs: - name: Build Package run: | - python -m build --sdist --wheel --outdir dist + python -m build --outdir dist - name: Login to registry git.sh-edraft.de uses: https://github.com/docker/login-action@v1