From 4df4586cd029a5b9a1b1d49ebec8b4402e25415f Mon Sep 17 00:00:00 2001 From: Sean OMeara Date: Tue, 21 Mar 2023 17:05:39 +0100 Subject: [PATCH] tweaking --- .drone.jsonnet | 2 +- .drone.yml | 153 ++----------------------------------------------- Makefile | 1 + 3 files changed, 6 insertions(+), 150 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 3fbaddfea..7dab1dd21 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -28,7 +28,7 @@ local targets = [ { "os": "linux", distro: "redhat", "name": "el9", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, // { "os": "linux", distro: "ubuntu", "name": "jammy", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, - { "os": "linux", distro: "ubuntu", "name": "jessie", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, +// { "os": "linux", distro: "ubuntu", "name": "jessie", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, // { "os": "windows", distro: "windows", "name": "windows", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, // { "os": "darwin", distro: "darwin", "name": "darwin", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }, diff --git a/.drone.yml b/.drone.yml index 8c8efd554..3b73c20be 100644 --- a/.drone.yml +++ b/.drone.yml @@ -105,112 +105,6 @@ volumes: path: /zerotier-releases name: zerotier-releases --- -clone: - depth: 1 -kind: pipeline -name: jessie amd64 build -platform: - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh jessie ubuntu amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder - name: build - when: - event: - - push -- commands: - - ./ci/scripts/build.sh jessie ubuntu amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder - name: release - when: - event: - - tag -- commands: - - ./ci/scripts/publish.sh jessie ubuntu amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder - name: copy build - volumes: - - name: zerotier-builds - path: /zerotier-builds - when: - event: - - push -- commands: - - ./ci/scripts/publish.sh jessie ubuntu amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder - name: copy relase - volumes: - - name: zerotier-releases - path: /zerotier-releases - when: - event: - - tag -trigger: - event: - - push - - tag - - custom -type: docker -volumes: -- host: - path: /zerotier-builds - name: zerotier-builds -- host: - path: /zerotier-releases - name: zerotier-releases ---- -clone: - depth: 1 -depends_on: -- jessie amd64 build -kind: pipeline -name: jessie index -platform: - os: linux -pull: always -steps: -- commands: - - /usr/local/bin/index zerotier-builds ubuntu jessie amd64 - environment: - GPG_PRIVATE_KEY: - from_secret: gpg-private-key - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/apt-builder - name: index build - volumes: - - name: zerotier-builds - path: /zerotier-builds - when: - event: - - push -- commands: - - /usr/local/bin/index zerotier-releases ubuntu jessie amd64 - environment: - GPG_PRIVATE_KEY: - from_secret: gpg-private-key - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/apt-builder - name: index release - volumes: - - name: zerotier-releases - path: /zerotier-releases - when: - event: - - tag -trigger: - event: - - push - - tag - - custom -type: docker -volumes: -- host: - path: /zerotier-builds - name: zerotier-builds -- host: - path: /zerotier-releases - name: zerotier-releases ---- clone: depth: 1 depends_on: @@ -255,46 +149,7 @@ volumes: path: /zerotier-releases name: zerotier-releases --- -clone: - depth: 1 -depends_on: -- jessie index -kind: pipeline -name: jessie amd64 test -platform: - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/test.sh jessie ubuntu amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder - name: test build - volumes: - - name: zerotier-builds - path: /zerotier-builds - when: - event: - - push -- commands: - - ./ci/scripts/test.sh jessie ubuntu amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder - name: test release - volumes: - - name: zerotier-releases - path: /zerotier-releases - when: - event: - - tag -trigger: - event: - - push - - tag - - custom -type: docker -volumes: -- host: - path: /zerotier-builds - name: zerotier-builds -- host: - path: /zerotier-releases - name: zerotier-releases +kind: signature +hmac: 63cf1ac3614525c8210517e12b12b009f510dbdaf463dbfc21a4db83d00357dd + +... diff --git a/Makefile b/Makefile index 0440f89a8..1bedf304a 100644 --- a/Makefile +++ b/Makefile @@ -30,3 +30,4 @@ endif drone: @echo "rendering .drone.yaml from .drone.jsonnet" drone jsonnet --format --stream + drone sign zerotier/ZeroTierOne --save