Revert "chore: update jsonnet"

This reverts commit 51fa660.

.github/jsonnet/GIT_VERSION

@@ -1 +1 @@
-e4a3467b90e35c3dadf461f338838837bf02d2f0
+4187fef119638c2f8453bf4fd3d6da5641e4ffee

.github/jsonnet/README.md

@@ -1,2 +1,2 @@
 These files come from https://www.github.com/gynzy/lib-jsonnet/
-Do not update here, but extend the libraries upstream.
+Do not update here, but extend the libraries upstream.

.github/jsonnet/base.jsonnet

@@ -1,6 +1,3 @@
-local images = import 'images.jsonnet';
-local misc = import 'misc.jsonnet';
-
 {
   pipeline(name, jobs, event=['pull_request'], permissions=null, concurrency=null):: {
     [name + '.yml']:
@@ -17,7 +14,7 @@ local misc = import 'misc.jsonnet';
     name,
     timeoutMinutes=30,
     runsOn=null,
-    image=images.default_job_image,
+    image=$.default_job_image,
     steps=[],
     ifClause=null,
     needs=null,
@@ -39,7 +36,7 @@ local misc = import 'misc.jsonnet';
                   {
                     container: {
                       image: image,
-                    } + (if useCredentials then { credentials: { username: '_json_key', password: misc.secret('docker_gcr_io') } } else {}),
+                    } + (if useCredentials then { credentials: { username: '_json_key', password: $.secret('docker_gcr_io') } } else {}),
                   }
               ) +
               {
@@ -52,7 +49,7 @@ local misc = import 'misc.jsonnet';
               (if permissions == null then {} else { permissions: permissions }) +
               (if concurrency == null then {} else { concurrency: concurrency }) +
               (if continueOnError == null then {} else { 'continue-on-error': continueOnError }) +
-              (if env == null then {} else { env: env }),
+              (if env == null then {} else { env: env })
     },
 
   ghExternalJob(
@@ -68,7 +65,7 @@ local misc = import 'misc.jsonnet';
            } else {}),
     },
 
-  step(name, run, env=null, workingDirectory=null, ifClause=null, id=null, continueOnError=null, shell=null)::
+  step(name, run, env=null, workingDirectory=null, ifClause=null, id=null, continueOnError=null)::
     [
       {
         name: name,
@@ -77,8 +74,7 @@ local misc = import 'misc.jsonnet';
       + (if env != null then { env: env } else {})
       + (if ifClause != null then { 'if': ifClause } else {})
       + (if id != null then { id: id } else {})
-      + (if continueOnError == null then {} else { 'continue-on-error': continueOnError })
-      + (if shell == null then {} else { 'shell': shell }),
+      + (if continueOnError == null then {} else { 'continue-on-error': continueOnError }),
     ],
 
   action(name, uses, env=null, with=null, id=null, ifClause=null, continueOnError=null)::

.github/jsonnet/clusters.jsonnet

@@ -1,27 +1,24 @@
-local misc = import 'misc.jsonnet';
-
 {
-  test: {
-    project: 'gynzy-test-project',
-    name: 'test',
-    zone: 'europe-west4-b',
-    secret: misc.secret('GCE_NEW_TEST_JSON'),
-    jobNodeSelectorType: 'preemptible',
-  },
+  clusters: {
+    test: {
+      project: 'gynzy-test-project',
+      name: 'test',
+      zone: 'europe-west4-b',
+      secret: '${{ secrets.GCE_NEW_TEST_JSON }}',
+    },
 
-  prod: {
-    project: 'unicorn-985',
-    name: 'prod-europe-west4',
-    zone: 'europe-west4',
-    secret: misc.secret('GCE_JSON'),
-    jobNodeSelectorType: 'worker',
-  },
+    prod: {
+      project: 'unicorn-985',
+      name: 'prod-europe-west4',
+      zone: 'europe-west4',
+      secret: '${{ secrets.GCE_JSON }}',
+    },
 
-  'gynzy-intern': {
-    project: 'gynzy-intern',
-    name: 'gynzy-intern',
-    zone: 'europe-west4',
-    secret: misc.secret('CONTINUOUS_DEPLOYMENT_GCE_JSON'),
-    jobNodeSelectorType: 'worker',
+    'gynzy-intern': {
+      project: 'gynzy-intern',
+      name: 'gynzy-intern',
+      zone: 'europe-west4',
+      secret: '${{ secrets.CONTINUOUS_DEPLOYMENT_GCE_JSON }}',
+    },
   },
 }