ci: update

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>

Author: rissson

.github/workflows/rolling.yml

@@ -29,23 +29,32 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ steps.app-token.outputs.token }}
+          path: client-python
       - name: Install python and dependencies
         run: |
           pipx install poetry || true
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version-file: pyproject.toml
+          python-version-file: client-python/pyproject.toml
+      - name: Fetch schema
+        uses: actions/checkout@v5
+        with:
+          repository: goauthentik/authentik
+          token: "${{ steps.app-token.outputs.token }}"
+          ref: main
+          path: authentik
+          sparse-checkout: |
+            schema.yml
+          sparse-checkout-cone-mode: false
       - name: Publish to GitHub
+        working-directory: client-python
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |
-          wget -O schema.yml "https://raw.githubusercontent.com/goauthentik/authentik/main/schema.yml"
           version="$(yq -r '.info.version' schema.yml)-$(date +%s)"
-          git restore schema.yml
-
-          make ref=main version="$version"
-          git diff --exit-code >/dev/null && exit 0 || echo
+          make version="$version"
+          [ "$(wc -l < diff.test)" -lt 4 ] && exit 0 || echo
 
           git config --global user.name '${{ steps.app-token.outputs.app-slug }}[bot]'
           git config --global user.email '${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com'
@@ -58,9 +67,10 @@ jobs:
           truncate -s '<125000' diff.test
           gh release create v$version -F diff.test --prerelease
       - name: Build package
+        working-directory: client-python
         run: |
           poetry build
       - name: Publish to PyPi
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          packages-dir: dist/
+          packages-dir: client-python/dist/

.github/workflows/stable.yml

@@ -62,14 +62,26 @@ jobs:
         with:
           fetch-depth: 0
           token: "${{ steps.app-token.outputs.token }}"
+          path: client-python
       - name: Install python and dependencies
         run: |
           pipx install poetry || true
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version-file: pyproject.toml
+          python-version-file: client-python/pyproject.toml
+      - name: Fetch schema
+        uses: actions/checkout@v5
+        with:
+          repository: goauthentik/authentik
+          token: "${{ steps.app-token.outputs.token }}"
+          ref: "${{ matrix.tag }}"
+          path: authentik
+          sparse-checkout: |
+            schema.yml
+          sparse-checkout-cone-mode: false
       - name: Publish
+        working-directory: client-python
         run: |
           tag="${{ matrix.tag }}"
           version="$(echo -n "$tag" | sed 's/version\///')"
@@ -80,25 +92,25 @@ jobs:
             git checkout "$branch"
           fi
 
-          make ref="$tag" version="$version"
+          make version="$version"
 
           git config --global user.name '${{ steps.app-token.outputs.app-slug }}[bot]'
           git config --global user.email '${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com'
 
           git add .
-          git commit -F "diff.test" || exit 0
+          git commit -m "Version $version" || exit 0
           git tag "$tag"
           git push origin "$branch"
           git push --tags
           cargo publish
-          truncate -s '<125000' diff.test
-          gh release create "$tag" -F diff.test --latest --title "$version"
+          gh release create "$tag" --latest --title "$version"
         env:
           GH_TOKEN: "${{ steps.app-token.outputs.token }}"
       - name: Build package
+        working-directory: client-python
         run: |
           poetry build
       - name: Publish to PyPi
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          packages-dir: dist/
+          packages-dir: client-python/dist/

Makefile

@@ -3,34 +3,35 @@ PWD = $(shell pwd)
 UID = $(shell id -u)
 GID = $(shell id -g)
 
-all: clean build
+all: clean update diff build
 
 clean:
-	rm -rf src/ docs/
+	rm -rf src/ docs/ test/
 
-build:
-ifndef ref
-	$(error Usage: make build ref=main version=20xx.xx.xx)
-endif
-ifndef version
-	$(error Usage: make build ref=main version=20xx.xx.xx)
-endif
+update:
 	mv schema.yml schema-old.yml
-	wget -O schema.yml "https://raw.githubusercontent.com/goauthentik/authentik/$(ref)/schema.yml"
-	docker compose -f scripts/docker-compose.yml run --user "${UID}:${GID}" diff \
+	cp ../authentik/schema.yml schema.yml
+
+diff:
+	docker compose -f scripts/docker-compose.yml run --rm --user "${UID}:${GID}" diff \
 		--markdown \
 		/local/diff.test \
 		/local/schema-old.yml \
 		/local/schema.yml
 	rm schema-old.yml
-	docker compose -f scripts/docker-compose.yml run --user "${UID}:${GID}" gen \
+	mv diff.test /tmp/diff.test
+	echo -e "Update API Client\n\n" > diff.test
+	cat /tmp/diff.test >> diff.test
+
+build:
+ifndef version
+	$(error Usage: make build version=20xx.xx.xx)
+endif
+	docker compose -f scripts/docker-compose.yml run --rm --user "${UID}:${GID}" gen \
 		generate \
 		-i /local/schema.yml \
 		-g python \
 		-o /local \
 		-c /local/config.yaml \
 		--additional-properties=packageVersion=$(version)
 	rm -f .travis.yml git_push.sh .gitlab-ci.yml .github/workflows/python.yml
-	mv diff.test /tmp/diff.test
-	echo "Update API Client\n\n" > diff.test
-	cat /tmp/diff.test >> diff.test