New builds

Jenkinsfile

@@ -1,56 +1,25 @@
 pipeline {
-    agent {
-        label 'docker-x86_64'
-    }
-
-    triggers {
-      GenericTrigger(
-        genericVariables: [[key: 'ref', value: '$.ref']],
-        causeString: 'Triggered on $ref',
-        printContributedVariables: true,
-        printPostContent: true,
-        silentResponse: false,
-        shouldNotFlatten: false,
-        regexpFilterText: '$ref',
-        regexpFilterExpression: 'refs/heads/' + BRANCH_NAME
-      )
-    }
-
-    options {
-        disableConcurrentBuilds()
-        buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10'))
-    }
-
+  agent any
+  options { disableConcurrentBuilds(); buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10')); }
   stages {
-        stage('Makings') {
-            agent {
-                docker {
-                    image "schemers/chibi:head"
-                    reuseNode true
-                    args '--user=root'
-                }
-            }
+    agent { docker { image 'schemers/chibi:head'; reuseNode true; args '--user=root'; } }
     steps {
       script {
-                        stage("one") {
+        stage('init') {
           catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                sh "ls"
+            sh 'apt-get update && apt-get install -y git ca-certificates gcc make libffi-dev'
+            sh 'git clone https://github.com/ashinn/chibi-scheme.git --depth=1'
+            sh 'make -j8 -C chibi-scheme'
+            sh 'make -j8 -C chibi-scheme install'
+            sh 'snow-chibi install retropikzel.compile-r7rs'
           }
         }
-                        stage("two") {
+        stage('tap') {
           catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                sh "ls"
+            sh 'COMPILE_R7RS=chibi compile-r7rs '
           }
         }
       }
     }
   }
 }
-
-
-    post {
-        success {
-            cleanWs()
-        }
-    }
-}

Makefile

@@ -77,5 +77,8 @@ retropikzel/wasm/plus.wat: retropikzel/wasm/plus.c
 	emcc -o retropikzel/wasm/plus.js retropikzel/wasm/plus.c
 	wasm-dis retropikzel/wasm/plus.wasm > retropikzel/wasm/plus.wat
 
+jenkinsfile: makings.scm
+	makings --jenkinsfile > Jenkinsfile
+
 clean:
 	git clean -X -f

makings.scm

@@ -1,16 +1,16 @@
 (let ((init
-        `("apt-get update && apt-get install -y git ca-certificates gcc make libffi-dev"
+        '("apt-get update && apt-get install -y git ca-certificates gcc make libffi-dev"
           "git clone https://github.com/ashinn/chibi-scheme.git --depth=1"
           "make -j8 -C chibi-scheme"
           "make -j8 -C chibi-scheme install"
           "snow-chibi install retropikzel.compile-r7rs"))
       (tap
         (lambda (scheme)
-          (string-append "COMPILE_R7RS=" scheme " compile-r7rs "))))
+          (list (string-append "COMPILE_R7RS=" scheme " compile-r7rs ")))))
 
   (map (lambda (scheme)
          `((image ,(string-append "schemers/" scheme ":head"))
            (stages
-             (init ,init)
-             (tap ,(tap scheme)))))
+             (init ,@init)
+             (tap ,@(tap scheme)))))
        '("chibi")))