From 4702772069c9fc91532fc0ae669f8b3ff197bce1 Mon Sep 17 00:00:00 2001 From: Sean OMeara Date: Tue, 28 Mar 2023 11:28:09 +0200 Subject: [PATCH] jammy --- .drone.jsonnet | 4 ++-- .drone.yml | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 7dab1dd21..c8b93f892 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -26,8 +26,8 @@ local targets = [ // { "os": "linux", distro: "debian", "name": "stretch", "isas": [ "386", "armv7", "amd64", "arm64" ], "events": [ "tag" ] }, // { "os": "linux", distro: "debian", "name": "jessie", "isas": [ "386", "armv7", "amd64" ], "events": [ "tag" ] }, - { "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: "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": "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 3b73c20be..e367bce19 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,27 +2,27 @@ clone: depth: 1 kind: pipeline -name: el9 amd64 build +name: jammy amd64 build platform: os: linux pull: always steps: - commands: - - ./ci/scripts/build.sh el9 redhat amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} + - ./ci/scripts/build.sh jammy 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 el9 redhat amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} + - ./ci/scripts/build.sh jammy 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 el9 redhat amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} + - ./ci/scripts/publish.sh jammy 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: @@ -32,7 +32,7 @@ steps: event: - push - commands: - - ./ci/scripts/publish.sh el9 redhat amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} + - ./ci/scripts/publish.sh jammy ubuntu amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: copy relase volumes: @@ -58,19 +58,19 @@ volumes: clone: depth: 1 depends_on: -- el9 amd64 build +- jammy amd64 build kind: pipeline -name: el9 index +name: jammy index platform: os: linux pull: always steps: - commands: - - /usr/local/bin/index zerotier-builds redhat el9 amd64 + - /usr/local/bin/index zerotier-builds ubuntu jammy amd64 environment: GPG_PRIVATE_KEY: from_secret: gpg-private-key - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/dnf-builder + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/apt-builder name: index build volumes: - name: zerotier-builds @@ -79,11 +79,11 @@ steps: event: - push - commands: - - /usr/local/bin/index zerotier-releases redhat el9 amd64 + - /usr/local/bin/index zerotier-releases ubuntu jammy amd64 environment: GPG_PRIVATE_KEY: from_secret: gpg-private-key - image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/dnf-builder + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/apt-builder name: index release volumes: - name: zerotier-releases @@ -108,15 +108,15 @@ volumes: clone: depth: 1 depends_on: -- el9 index +- jammy index kind: pipeline -name: el9 amd64 test +name: jammy amd64 test platform: os: linux pull: always steps: - commands: - - ./ci/scripts/test.sh el9 redhat amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} + - ./ci/scripts/test.sh jammy 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: @@ -126,7 +126,7 @@ steps: event: - push - commands: - - ./ci/scripts/test.sh el9 redhat amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} + - ./ci/scripts/test.sh jammy ubuntu amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT} image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: test release volumes: @@ -150,6 +150,6 @@ volumes: name: zerotier-releases --- kind: signature -hmac: 63cf1ac3614525c8210517e12b12b009f510dbdaf463dbfc21a4db83d00357dd +hmac: 2720f6d3e0e35871051e5622f834f5276531f19dae6318f6be64ecb61f2164da ...