bump

codefresh-io · Jan 10, 2024 · aed8822 · aed8822
2 parents b06b870 + fe9c49d
commit aed8822
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/incubating/obtain-oidc-id-token/step.yaml b/incubating/obtain-oidc-id-token/step.yaml
@@ -1,7 +1,7 @@
 version: '1.0'
 kind: step-type
 metadata:
-  version: 1.2.3
+  version: 1.2.2
   name: obtain-oidc-id-token
   description: >-
     Obtain ID token from Codefresh OIDC Provider
@@ -107,12 +107,20 @@ spec:
   steps:
     main:
       name: obtain-oidc-id-token
+<<<<<<< HEAD
       image: quay.io/codefreshplugins/curl-jq
+=======
+      image: quay.io/ferdi/ci-utils:latest
+>>>>>>> fe9c49d31dd0ff42ca0987bc7ea9f6ebd153910b
       environment:
         - 'AUDIENCE=${{AUDIENCE}}'
       commands:
         - |
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> fe9c49d31dd0ff42ca0987bc7ea9f6ebd153910b
           URL="$CF_OIDC_REQUEST_URL"
 
           # This means that audience was provided by the user