Skip to content

Commit

Permalink
Merge branch 'main' into fix-build
Browse files Browse the repository at this point in the history
  • Loading branch information
waltkb committed Feb 17, 2025
2 parents 194c9de + 8332dc8 commit 8116c6e
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/actions/gradle-setup-action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
with:
distribution: 'temurin'
java-version: '21'
- name: Gradle wrapper validation
uses: gradle/actions/wrapper-validation@v4
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
- name: Gradle wrapper validation
uses: gradle/actions/wrapper-validation@v4
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
version:
uses: walt-id/waltid-identity/.github/workflows/version.yml@266f5c09359450c39019a6da38f2b331e7122918
gradle-build:
uses: walt-id/waltid-identity/.github/workflows/build-gradle.yml@266f5c09359450c39019a6da38f2b331e7122918
uses: walt-id/waltid-identity/.github/workflows/gradle.yml@d3e3284f901bef1e6d80b35720fbae5e4b49a95a
needs: version
with:
version: ${{ needs.version.outputs.release_version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Configure gradle
uses: ./.github/actions/gradle-setup-action@266f5c09359450c39019a6da38f2b331e7122918
uses: walt-id/waltid-identity/.github/actions/gradle-setup-action@f7b46c8ae1c27f1a0873a5ca8dfb0440c77381ec
- name: Set version
run: |
sed -i "s/1.0.0-SNAPSHOT/${{ inputs.version }}/g" build.gradle.kts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
with:
suffix: -SNAPSHOT
gradle:
uses: walt-id/waltid-identity/.github/workflows/gradle.yml@927c4233610e90dd8a57418662fad7293b7b29a4
uses: walt-id/waltid-identity/.github/workflows/gradle.yml@d3e3284f901bef1e6d80b35720fbae5e4b49a95a
secrets: inherit
needs: version
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
with:
preferred: ${{ inputs.release_version }}
gradle:
uses: walt-id/waltid-identity/.github/workflows/gradle.yml@927c4233610e90dd8a57418662fad7293b7b29a4
uses: walt-id/waltid-identity/.github/workflows/gradle.yml@d3e3284f901bef1e6d80b35720fbae5e4b49a95a
secrets: inherit
needs: version
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
with:
preferred: ${{ inputs.release_version }}
gradle:
uses: walt-id/waltid-identity/.github/workflows/gradle.yml@927c4233610e90dd8a57418662fad7293b7b29a4
uses: walt-id/waltid-identity/.github/workflows/gradle.yml@d3e3284f901bef1e6d80b35720fbae5e4b49a95a
secrets: inherit
needs: version
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import id.walt.oid4vc.data.OpenIDProviderMetadata
import id.walt.oid4vc.data.dif.DescriptorMapping
import id.walt.oid4vc.data.dif.PresentationDefinition
import id.walt.oid4vc.data.dif.PresentationSubmission
import id.walt.oid4vc.data.dif.VCFormat
import id.walt.credentials.utils.VCFormat
import id.walt.oid4vc.errors.PresentationError
import id.walt.oid4vc.interfaces.PresentationResult
import id.walt.oid4vc.interfaces.SimpleHttpResponse
Expand Down Expand Up @@ -358,7 +358,7 @@ internal class TestCredentialWallet(
}

override val metadata: OpenIDProviderMetadata
get() = createDefaultProviderMetadata()
get() = createDefaultProviderMetadata() as OpenIDProviderMetadata.Draft13

override fun getSession(id: String) = sessionCache[id]
override fun getSessionByAuthServerState(authServerState: String): SIOPSession? {
Expand Down
5 changes: 5 additions & 0 deletions waltid-applications/waltid-web-portal/k8s/deployment-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,12 @@ metadata:
name: portal-ingress
annotations:
kubernetes.io/ingress.class: "nginx"
cert-manager.io/cluster-issuer: letsencrypt-prod
spec:
tls:
- hosts:
- portal.test.waltid.cloud
secretName: web-portal-tls-secret
rules:
- host: portal.test.waltid.cloud
http:
Expand Down
5 changes: 5 additions & 0 deletions waltid-services/waltid-issuer-api/k8s/deployment-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ metadata:
name: issuer
annotations:
kubernetes.io/ingress.class: "nginx"
cert-manager.io/cluster-issuer: letsencrypt-prod
spec:
tls:
- hosts:
- issuer.portal.test.waltid.cloud
secretName: issuer-tls-secret
rules:
- host: issuer.portal.test.waltid.cloud
http:
Expand Down
5 changes: 5 additions & 0 deletions waltid-services/waltid-verifier-api/k8s/deployment-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,12 @@ metadata:
name: verifier
annotations:
kubernetes.io/ingress.class: "nginx"
cert-manager.io/cluster-issuer: letsencrypt-prod
spec:
tls:
- hosts:
- verifier.portal.test.waltid.cloud
secretName: verifier-tls-secret
rules:
- host: verifier.portal.test.waltid.cloud
http:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,12 @@ metadata:
name: opa-ingress
annotations:
kubernetes.io/ingress.class: "nginx"
cert-manager.io/cluster-issuer: letsencrypt-prod
spec:
tls:
- hosts:
- opa.test.waltid.cloud
secretName: opa-tls-secret
rules:
- host: opa.test.waltid.cloud
http:
Expand Down
8 changes: 8 additions & 0 deletions waltid-services/waltid-wallet-api/k8s/deployment-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,19 @@ metadata:
name: wallet-ingress
annotations:
kubernetes.io/ingress.class: "nginx"
cert-manager.io/cluster-issuer: letsencrypt-prod
ingress.kubernetes.io/configuration-snippet: |
if ($host ~ ^(.+)\.waltid\.org$) {
return 301 https://$1.walt-test.cloud$request_uri;
}
spec:
tls:
- hosts:
- wallet.test.waltid.cloud
secretName: wallet-demo-tls-secret
- hosts:
- wallet-dev.test.waltid.cloud
secretName: wallet-dev-tls-secret
rules:
- host: wallet-dev.test.waltid.cloud
http:
Expand Down

0 comments on commit 8116c6e

Please sign in to comment.