diff --git a/.gitea/workflows/build-and-publish.yaml b/.gitea/workflows/build-and-publish.yaml index 4fd703a..93a2821 100644 --- a/.gitea/workflows/build-and-publish.yaml +++ b/.gitea/workflows/build-and-publish.yaml @@ -8,39 +8,26 @@ env: IMAGE_NAME: ${{ github.event.repository.name }} jobs: build-release: - runs-on: ubuntu-latest + runs-on: nix permissions: id-token: write contents: read steps: - name: Checkout repository uses: actions/checkout@v4 - - - uses: DeterminateSystems/determinate-nix-action@v3 - - uses: DeterminateSystems/flake-checker-action@main - with: - flake-lock-path: ./build/flake.lock - - - name: Setup Attic cache - uses: ryanccn/attic-action@v0 - with: - endpoint: ${{ secrets.ATTIC_ENDPOINT }} - cache: ${{ secrets.ATTIC_CACHE }} - token: ${{ secrets.ATTIC_TOKEN }} - - name: Build Docker Image via Nix Flake run: | nix build ./build#dockerImage --print-build-logs docker load < result - + - name: Log in to Gitea Container Registry uses: docker/login-action@v3 with: registry: ${{ github.server_url }} username: ${{ secrets.CI_USER }} password: ${{ secrets.CI_PASSWORD }} - + - name: Tag and Push Docker Image run: | VERSION=${{ github.run_number }} @@ -57,23 +44,25 @@ jobs: docker tag $SOURCE_IMAGE $TARGET_IMAGE:latest docker push $TARGET_IMAGE:$VERSION docker push $TARGET_IMAGE:latest - + - name: Setup Helm uses: azure/setup-helm@v4 with: version: v3.14.0 - + - name: Package Helm Chart run: | VERSION=${{ github.run_number }} + helm repo add bjw-s https://bjw-s-labs.github.io/helm-charts + helm dependency build ops/chart helm package ops/chart --version $VERSION --app-version $VERSION - + - name: Push Helm Chart to Gitea Registry run: | VERSION=${{ github.run_number }} CHART_FILE=${{ env.CHART_NAME }}-${VERSION}.tgz - + curl -f --user "${{ secrets.CI_USER }}:${{ secrets.CI_PASSWORD }}" \ -X POST \ --upload-file ./$CHART_FILE \ - "${{ github.server_url }}/api/packages/${{ github.repository_owner }}/helm/api/charts" + "${{ github.server_url }}/api/packages/${{ github.repository_owner }}/helm/api/charts" \ No newline at end of file diff --git a/internal/controller/oidcapp_controller.go b/internal/controller/oidcapp_controller.go index 518aaaf..1774ce0 100644 --- a/internal/controller/oidcapp_controller.go +++ b/internal/controller/oidcapp_controller.go @@ -110,7 +110,7 @@ func (wr *wrappedOIDCAppReconciler) Reconcile(ctx context.Context, ztdClient *cl } responseTypes := []application.OIDCResponseType{} for _, r := range wr.OIDCApp.Spec.ResponseTypes { - responseTypes = append(responseTypes, application.OIDCResponseType(application.OIDCApplicationType_value[string(r)])) + responseTypes = append(responseTypes, application.OIDCResponseType(application.OIDCResponseType_value[string(r)])) } grantTypes := []application.OIDCGrantType{} for _, r := range wr.OIDCApp.Spec.GrantTypes {