diff --git a/ci/Dockerfile b/ci/Dockerfile deleted file mode 100644 index 5ef8faa..0000000 --- a/ci/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM rust:1.59.0-slim - -RUN apt-get update && \ - apt-get install -y \ - cmake \ - git \ - libssl-dev \ - libx11-dev \ - libxext-dev \ - pkg-config \ - && \ - apt-get clean && \ - rm -rf /var/cache/apt /var/lib/apt diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index 3310508..4e81fa2 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -10,9 +10,10 @@ pipeline { parallel { stage('Build: x86_64') { agent { - dockerfile { - label 'x86_64' - dir 'ci' + kubernetes { + yamlFile 'ci/podTemplate.yaml' + nodeSelector 'kubernetes.io/arch=amd64' + defaultContainer 'build' } } steps { @@ -27,9 +28,10 @@ pipeline { stage('Build: aarch64') { agent { - dockerfile { - label 'aarch64' - dir 'ci' + kubernetes { + yamlFile 'ci/podTemplate.yaml' + nodeSelector 'kubernetes.io/arch=arm64' + defaultContainer 'build' } } steps { diff --git a/ci/build.sh b/ci/build.sh index 09f749e..3918fc8 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -1,5 +1,6 @@ #!/bin/sh -ex +env cargo build --release --locked mkdir -p "$(uname -m)" ln -f target/release/mqttdpms "$(uname -m)"/ diff --git a/ci/podTemplate.yaml b/ci/podTemplate.yaml new file mode 100644 index 0000000..e4c1560 --- /dev/null +++ b/ci/podTemplate.yaml @@ -0,0 +1,8 @@ +spec: + containers: + - name: build + image: git.pyrocufflink.net/containerimages/build/mqttdpms + command: + - cat + stdin: true + tty: true