From 3ddaa60de95ffad7e96b2b436fb87c237689f9e9 Mon Sep 17 00:00:00 2001 From: Brenton Bostick Date: Tue, 29 Nov 2022 11:55:33 -0500 Subject: [PATCH 01/10] prevent: warning: unused variable 'gotViaProc' (#1797) --- osdep/Binder.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/osdep/Binder.hpp b/osdep/Binder.hpp index 4e08f4539..666d63670 100644 --- a/osdep/Binder.hpp +++ b/osdep/Binder.hpp @@ -313,6 +313,13 @@ class Binder { #else const bool gotViaProc = false; #endif + + // + // prevent: + // warning: unused variable 'gotViaProc' + // + (void)gotViaProc; + #if ! (defined(ZT_SDK) || defined(__ANDROID__)) // getifaddrs() freeifaddrs() not available on Android if (! gotViaProc) { struct ifaddrs* ifatbl = (struct ifaddrs*)0; From 85da0b419c19da97f8310f9200b48d7ae68f2e23 Mon Sep 17 00:00:00 2001 From: Sean OMeara Date: Wed, 30 Nov 2022 10:29:33 +0100 Subject: [PATCH 02/10] drone config --- .drone.jsonnet | 74 +- .drone.yml | 2565 +------------------------------------------ ci/Dockerfile.deb | 2 +- ci/Dockerfile.none | 5 + ci/Dockerfile.rpm | 2 +- ci/scripts/build.sh | 96 +- 6 files changed, 124 insertions(+), 2620 deletions(-) create mode 100644 ci/Dockerfile.none diff --git a/.drone.jsonnet b/.drone.jsonnet index 30271d99e..eae15501b 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,50 +1,7 @@ +local registry = "084037375216.dkr.ecr.us-east-2.amazonaws.com"; local targets = [ - // - // Render these into .drone.yaml by running "make drone" - // - { "os": "linux", "name": "el9", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "el8", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "el7", "isas": [ "amd64", "ppc64le"], "events": [ "tag" ] }, - { "os": "linux", "name": "el6", "isas": [ "amd64" ], "events": [ "tag" ] }, - { "os": "linux", "name": "amzn2", "isas": [ "amd64", "arm64" ], "events": [ "tag" ] }, - { "os": "linux", "name": "fc37", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "fc36", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "fc35", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "jammy", "isas": [ "amd64", "arm64", "armv7", "riscv64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "focal", "isas": [ "amd64", "arm64", "armv7", "riscv64", "ppc64le" ], "events": [ "tag" ] }, - { "os": "linux", "name": "bionic", "isas": [ "amd64", "arm64", "386", "ppc64le", "s390x" ], "events": ["tag" ] }, - { "os": "linux", "name": "xenial", "isas": [ "amd64", "arm64", "386" ], "events": [ "tag" ] }, - { "os": "linux", "name": "sid", "isas": [ "386", "amd64", "arm64", "riscv64", "mips64le", "ppc64le", "s390x" ], "events": [ "push", "tag" ] }, - { "os": "linux", "name": "bookworm", "isas": [ "amd64", "arm64", "armv7", "386", "mips64le", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "bullseye", "isas": [ "amd64", "arm64", "armv7", "386", "mips64le", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "buster", "isas": [ "amd64", "arm64", "armv7", "386", "mips64le", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "stretch", "isas": [ "amd64", "arm64", "386" ], "events": [ "tag" ] }, - // { "os": "windows", "name": "win2k19", "isas": [ "amd64" ], "events": ["push", "tag" ] } -]; - -local master_targets = [ - // - // Render these into .drone.yaml by running "make drone" - // - { "os": "linux", "name": "el9", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "el8", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "el7", "isas": [ "amd64", "ppc64le"], "events": [ "tag" ] }, - { "os": "linux", "name": "el6", "isas": [ "amd64" ], "events": [ "tag" ] }, - { "os": "linux", "name": "amzn2", "isas": [ "amd64", "arm64" ], "events": [ "tag" ] }, - { "os": "linux", "name": "fc37", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "fc36", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "fc35", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "jammy", "isas": [ "amd64", "arm64", "armv7", "riscv64", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "focal", "isas": [ "amd64", "arm64", "armv7", "riscv64", "ppc64le" ], "events": [ "tag" ] }, - { "os": "linux", "name": "bionic", "isas": [ "amd64", "arm64", "386", "ppc64le", "s390x" ], "events": ["tag" ] }, - { "os": "linux", "name": "xenial", "isas": [ "amd64", "arm64", "386" ], "events": [ "tag" ] }, - { "os": "linux", "name": "sid", "isas": [ "386", "amd64", "arm64", "riscv64", "mips64le", "ppc64le", "s390x" ], "events": [ "push", "tag" ] }, - { "os": "linux", "name": "bookworm", "isas": [ "amd64", "arm64", "armv7", "386", "mips64le", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "bullseye", "isas": [ "amd64", "arm64", "armv7", "386", "mips64le", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "buster", "isas": [ "amd64", "arm64", "armv7", "386", "mips64le", "ppc64le", "s390x" ], "events": [ "tag" ] }, - { "os": "linux", "name": "stretch", "isas": [ "amd64", "arm64", "386" ], "events": [ "tag" ] }, - // { "os": "windows", "name": "win2k19", "isas": [ "amd64" ], "events": ["push", "tag" ] } + { "os": "linux", "name": "sid", "isas": [ "386", "armv7", "amd64", "arm64", "mips64le", "ppc64le", "s390x", "riscv64" ], "events": [ "push", "tag", "custom" ] }, ]; local Build(platform, os, isa, events) = { @@ -56,27 +13,18 @@ local Build(platform, os, isa, events) = { "steps": [ { "name": "build", - "image": "registry.sean.farm/honda-builder", - "commands": [ "./ci/scripts/build.sh " + platform + " " + isa + " " + "100.0.0+${DRONE_COMMIT_SHA:0:8}" + " " + "${DRONE_BUILD_EVENT}" ] - }, - { - "name": "list", - "image": "registry.sean.farm/honda-builder", - "commands": [ "ls -la " + platform ] + "image": registry + "/honda-builder", + "commands": [ + "aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin " + registry, + "./ci/scripts/build.sh " + platform + " " + isa + " " + "100.0.0+${DRONE_COMMIT_SHA:0:8}" + " " + "${DRONE_BUILD_EVENT}" + ] }, // { - // "name": "notify-mattermost", - // "image": "registry.sean.farm/mattermost-notify", - // "environment": { - // "token": { "from_secret": "mattermost-token" }, - // "host": { "from_secret": "mattermost-host" }, - // "channel": { "from_secret": "mattermost-channel" }, - // "maxRetry": 3, - // }, - // "when": { "status": [ "failure" ] } - // } + // "name": "list", + // "image": registry + "/honda-builder", + // "commands": [ "ls -la " + platform ] + // }, ], - "image_pull_secrets": [ "dockerconfigjson" ], [ if isa == "arm64" || isa == "armv7" then "platform" ]: { os: os, arch: "arm64" }, "trigger": { "event": events } }; diff --git a/.drone.yml b/.drone.yml index b2f91fe91..fc7643d45 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,1610 +1,66 @@ --- clone: depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: el9 amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh el9 amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la el9 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: el9 arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh el9 arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la el9 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: el9 ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh el9 ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la el9 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: el9 s390x build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh el9 s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la el9 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: el8 amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh el8 amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la el8 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: el8 arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh el8 arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la el8 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: el8 ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh el8 ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la el8 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: el8 s390x build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh el8 s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la el8 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: el7 amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh el7 amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la el7 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: el7 ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh el7 ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la el7 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: el6 amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh el6 amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la el6 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: amzn2 amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh amzn2 amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la amzn2 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: amzn2 arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh amzn2 arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la amzn2 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc37 amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc37 amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc37 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc37 arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc37 arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc37 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc37 ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc37 ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc37 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc37 s390x build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc37 s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc37 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc36 amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc36 amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc36 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc36 arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc36 arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc36 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc36 ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc36 ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc36 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc36 s390x build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc36 s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc36 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc35 amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc35 amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc35 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc35 arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc35 arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc35 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc35 ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc35 ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc35 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: fc35 s390x build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh fc35 s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la fc35 - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: jammy amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh jammy amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la jammy - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: jammy arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh jammy arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la jammy - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: jammy armv7 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh jammy armv7 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la jammy - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: jammy riscv64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh jammy riscv64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la jammy - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: jammy ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh jammy ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la jammy - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: jammy s390x build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh jammy s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la jammy - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: focal amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh focal amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la focal - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: focal arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh focal arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la focal - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: focal armv7 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh focal armv7 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la focal - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: focal riscv64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh focal riscv64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la focal - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: focal ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh focal ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la focal - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bionic amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bionic amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bionic - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bionic arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bionic arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bionic - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bionic 386 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bionic 386 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bionic - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bionic ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bionic ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bionic - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bionic s390x build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bionic s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bionic - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: xenial amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh xenial amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la xenial - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: xenial arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh xenial arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la xenial - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: xenial 386 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh xenial 386 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la xenial - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson kind: pipeline name: sid 386 build pull: always steps: - commands: + - aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin + 084037375216.dkr.ecr.us-east-2.amazonaws.com - ./ci/scripts/build.sh sid 386 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: build -- commands: - - ls -la sid - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure trigger: event: - push - tag + - custom +type: docker +--- +clone: + depth: 1 +kind: pipeline +name: sid armv7 build +platform: + arch: arm64 + os: linux +pull: always +steps: +- commands: + - aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin + 084037375216.dkr.ecr.us-east-2.amazonaws.com + - ./ci/scripts/build.sh sid armv7 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder + name: build +trigger: + event: + - push + - tag + - custom type: docker --- clone: depth: 1 -image_pull_secrets: -- dockerconfigjson kind: pipeline name: sid amd64 build pull: always steps: - commands: + - aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin + 084037375216.dkr.ecr.us-east-2.amazonaws.com - ./ci/scripts/build.sh sid amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: build -- commands: - - ls -la sid - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure trigger: event: - push - tag + - custom type: docker --- clone: depth: 1 -image_pull_secrets: -- dockerconfigjson kind: pipeline name: sid arm64 build platform: @@ -1613,1005 +69,90 @@ platform: pull: always steps: - commands: + - aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin + 084037375216.dkr.ecr.us-east-2.amazonaws.com - ./ci/scripts/build.sh sid arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: build -- commands: - - ls -la sid - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure trigger: event: - push - tag + - custom type: docker --- clone: depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: sid riscv64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh sid riscv64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la sid - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - push - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson kind: pipeline name: sid mips64le build pull: always steps: - commands: + - aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin + 084037375216.dkr.ecr.us-east-2.amazonaws.com - ./ci/scripts/build.sh sid mips64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: build -- commands: - - ls -la sid - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure trigger: event: - push - tag + - custom type: docker --- clone: depth: 1 -image_pull_secrets: -- dockerconfigjson kind: pipeline name: sid ppc64le build pull: always steps: - commands: + - aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin + 084037375216.dkr.ecr.us-east-2.amazonaws.com - ./ci/scripts/build.sh sid ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: build -- commands: - - ls -la sid - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure trigger: event: - push - tag + - custom type: docker --- clone: depth: 1 -image_pull_secrets: -- dockerconfigjson kind: pipeline name: sid s390x build pull: always steps: - commands: + - aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin + 084037375216.dkr.ecr.us-east-2.amazonaws.com - ./ci/scripts/build.sh sid s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: build -- commands: - - ls -la sid - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure trigger: event: - push - tag + - custom type: docker --- clone: depth: 1 -image_pull_secrets: -- dockerconfigjson kind: pipeline -name: bookworm amd64 build +name: sid riscv64 build pull: always steps: - commands: - - ./ci/scripts/build.sh bookworm amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder + - aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin + 084037375216.dkr.ecr.us-east-2.amazonaws.com + - ./ci/scripts/build.sh sid riscv64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} + image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder name: build -- commands: - - ls -la bookworm - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bookworm arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bookworm arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bookworm - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bookworm armv7 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bookworm armv7 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bookworm - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bookworm 386 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bookworm 386 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bookworm - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bookworm mips64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bookworm mips64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bookworm - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bookworm ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bookworm ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bookworm - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bookworm s390x build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bookworm s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bookworm - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bullseye amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bullseye amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bullseye - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bullseye arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bullseye arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bullseye - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bullseye armv7 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bullseye armv7 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bullseye - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bullseye 386 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bullseye 386 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bullseye - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bullseye mips64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bullseye mips64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bullseye - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bullseye ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bullseye ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bullseye - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: bullseye s390x build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh bullseye s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la bullseye - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: buster amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh buster amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la buster - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: buster arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh buster arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la buster - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: buster armv7 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh buster armv7 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la buster - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: buster 386 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh buster 386 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la buster - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: buster mips64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh buster mips64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la buster - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: buster ppc64le build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh buster ppc64le 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la buster - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: buster s390x build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh buster s390x 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la buster - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: stretch amd64 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh stretch amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la stretch - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: stretch arm64 build -platform: - arch: arm64 - os: linux -pull: always -steps: -- commands: - - ./ci/scripts/build.sh stretch arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la stretch - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure -trigger: - event: - - tag -type: docker ---- -clone: - depth: 1 -image_pull_secrets: -- dockerconfigjson -kind: pipeline -name: stretch 386 build -pull: always -steps: -- commands: - - ./ci/scripts/build.sh stretch 386 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT} - image: registry.sean.farm/honda-builder - name: build -- commands: - - ls -la stretch - image: registry.sean.farm/honda-builder - name: list -- environment: - channel: - from_secret: mattermost-channel - host: - from_secret: mattermost-host - maxRetry: 3 - token: - from_secret: mattermost-token - image: registry.sean.farm/mattermost-notify - name: notify-mattermost - when: - status: - - failure trigger: event: + - push - tag + - custom type: docker diff --git a/ci/Dockerfile.deb b/ci/Dockerfile.deb index 91b383a6a..151bca397 100644 --- a/ci/Dockerfile.deb +++ b/ci/Dockerfile.deb @@ -1,5 +1,5 @@ ARG PLATFORM -FROM registry.sean.farm/${PLATFORM}-builder as stage +FROM 084037375216.dkr.ecr.us-east-2.amazonaws.com/${PLATFORM}-builder as stage WORKDIR /work/build COPY . . RUN make debian diff --git a/ci/Dockerfile.none b/ci/Dockerfile.none new file mode 100644 index 000000000..bee0128f7 --- /dev/null +++ b/ci/Dockerfile.none @@ -0,0 +1,5 @@ +ARG PLATFORM +FROM 084037375216.dkr.ecr.us-east-2.amazonaws.com/${PLATFORM}-builder as stage +WORKDIR /work +COPY . . +RUN make diff --git a/ci/Dockerfile.rpm b/ci/Dockerfile.rpm index 9969be05e..0965148bc 100644 --- a/ci/Dockerfile.rpm +++ b/ci/Dockerfile.rpm @@ -1,5 +1,5 @@ ARG PLATFORM -FROM registry.sean.farm/${PLATFORM}-builder as stage +FROM 084037375216.dkr.ecr.us-east-2.amazonaws.com/${PLATFORM}-builder as stage WORKDIR /root/rpmbuild/BUILD COPY . . RUN make redhat diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh index e6aee6bc6..bc28e42f2 100755 --- a/ci/scripts/build.sh +++ b/ci/scripts/build.sh @@ -8,6 +8,9 @@ export VERSION=$3 export EVENT=$4 case $PLATFORM in + sid) + export PKGFMT=none + ;; el*|fc*|amzn*) export PKGFMT=rpm ;; @@ -15,22 +18,21 @@ case $PLATFORM in export PKGFMT=deb esac -# OSX -# x86_64-apple-darwin -# aarch64-apple-darwin +# +# Allow user to drop in custom Dockerfile for PLATFORM +# -# Windows -# x86_64-pc-windows-msvc -# i686-pc-windows-msvc -# aarch64-pc-windows-msvc +if [ -f "ci/Dockerfile.${PLATFORM}" ]; then + export DOCKERFILE="ci/Dockerfile.${PLATFORM}" +else + export DOCKERFILE="ci/Dockerfile.${PKGFMT}" +fi -# Linux -# i686-unknown-linux-gnu -# x86_64-unknown-linux-gnu -# arm-unknown-linux-gnueabi ? -# arm-unknown-linux-gnueabihf ? -# armv7-unknown-linux-gnueabihf -# +# +# Rust sometimes gets confused about where it's running. +# Normally, the build images will have Rust pre-baked. +# Pass RUST_TRIPLET for convenience when using a custom Dockerfile +# case $ZT_ISA in 386) @@ -41,13 +43,9 @@ case $ZT_ISA in export DOCKER_ARCH=amd64 export RUST_TRIPLET=x86_64-unknown-linux-gnu ;; - armv6) - export DOCKER_ARCH=arm/v6 - export RUST_TRIPLET=arm-unknown-linux-gnueabi - ;; - armv7) + armv7) export DOCKER_ARCH=arm/v7 - export RUST_TRIPLET=arm-unknown-linux-gnueabihf + export RUST_TRIPLET=armv7-unknown-linux-gnueabihf ;; arm64) export DOCKER_ARCH=arm64/v8 @@ -60,7 +58,7 @@ case $ZT_ISA in ppc64le) export DOCKER_ARCH=ppc64le export RUST_TRIPLET=powerpc64le-unknown-linux-gnu - ;; + ;; mips64le) export DOCKER_ARCH=mips64le export RUST_TRIPLET=mips64el-unknown-linux-gnuabi64 @@ -69,17 +67,15 @@ case $ZT_ISA in export DOCKER_ARCH=s390x export RUST_TRIPLET=s390x-unknown-linux-gnu ;; - *) + *) echo "ERROR: could not determine architecture settings. PLEASE FIX ME" exit 1 ;; esac -if [ -f "ci/Dockerfile.${PLATFORM}" ]; then - export DOCKERFILE="ci/Dockerfile.${PLATFORM}" -else - export DOCKERFILE="ci/Dockerfile.${PKGFMT}" -fi +# +# Print debug info +# echo "#~~~~~~~~~~~~~~~~~~~~" echo "$0 variables:" @@ -94,23 +90,37 @@ echo "PWD: ${PWD}" echo "DOCKERFILE: ${DOCKERFILE}" echo "#~~~~~~~~~~~~~~~~~~~~" -if [ ${EVENT} == "push" ]; then -make munge_rpm zerotier-one.spec VERSION=${VERSION} -make munge_deb debian/changelog VERSION=${VERSION} +# +# Munge RPM and Deb +# + +if [ ${PKGFMT} != "none" ] && [ ${EVENT} != "tag" ]; then + make munge_rpm zerotier-one.spec VERSION=${VERSION} + make munge_deb debian/changelog VERSION=${VERSION} fi -export DOCKER_BUILDKIT=1 -docker run --privileged --rm tonistiigi/binfmt --install all +# +# Assemble buildx arguments +# -# docker pull --platform linux/${DOCKER_ARCH} registry.sean.farm/${PLATFORM}-builder +build_args=( + --no-cache + --build-arg PLATFORM=${PLATFORM} + --build-arg RUST_TRIPLET=${RUST_TRIPLET} + --build-arg DOCKER_ARCH=${DOCKER_ARCH} + --platform linux/${DOCKER_ARCH} + -f ${DOCKERFILE} + -t build + . +) -docker buildx build \ - --build-arg PLATFORM="${PLATFORM}" \ - --build-arg RUST_TRIPLET="${RUST_TRIPLET}" \ - --build-arg DOCKER_ARCH="${DOCKER_ARCH}" \ - --platform linux/${DOCKER_ARCH} \ - -f ${DOCKERFILE} \ - -t build \ - . \ - --output type=local,dest=. \ - --target export +if [ ${PKGFMT} != "none" ]; then + build_args+=("--output type=local,dest=.") + build_args+=("--target export") +fi + +# +# Do build +# + +docker buildx build ${build_args[@]} From 9ac2cfe611a61cfd16463928159cee2de5b07b18 Mon Sep 17 00:00:00 2001 From: Brenton Bostick Date: Wed, 30 Nov 2022 12:44:32 -0500 Subject: [PATCH 03/10] Fix warning: suggest braces around initialization of subobject --- java/jni/com_zerotierone_sdk_Node.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp index 50dfd22e6..75af18bc8 100644 --- a/java/jni/com_zerotierone_sdk_Node.cpp +++ b/java/jni/com_zerotierone_sdk_Node.cpp @@ -573,7 +573,26 @@ namespace { return true; } - struct sockaddr_storage nullAddress = {0}; + // + // was: + // struct sockaddr_storage nullAddress = {0}; + // + // but was getting this warning: + // warning: suggest braces around initialization of subobject + // + // when building ZeroTierOne + // + struct sockaddr_storage nullAddress; + + // + // It is possible to assume knowledge about internals of sockaddr_storage and construct + // correct 0-initializer, but it is simpler to just treat sockaddr_storage as opaque and + // use memset here to fill with 0 + // + // This is also done in InetAddress.hpp for InetAddress + // + memset(&nullAddress, 0, sizeof(sockaddr_storage)); + jobject remoteAddressObj = NULL; if(memcmp(remoteAddress, &nullAddress, sizeof(sockaddr_storage)) != 0) From 4d50ed0b9d099a9588430693caeffb05e68f49a7 Mon Sep 17 00:00:00 2001 From: Brenton Bostick Date: Wed, 30 Nov 2022 12:45:16 -0500 Subject: [PATCH 04/10] Fix several warning: format specifies type 'XXX' but the argument has type 'YYY' Use %z for printing size_t and PRId64 etc. macros for printing platform-specific widths, and remove now-redundant casts --- node/Bond.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/node/Bond.cpp b/node/Bond.cpp index 14bf95ad8..dc17e6bee 100644 --- a/node/Bond.cpp +++ b/node/Bond.cpp @@ -18,6 +18,7 @@ #include #include #include +#include // for PRId64, etc. macros namespace ZeroTier { @@ -546,7 +547,7 @@ int32_t Bond::generateQoSPacket(int pathIdx, int64_t now, char* qosBuffer) std::map::iterator it = _paths[pathIdx].qosStatsIn.begin(); int i = 0; int numRecords = std::min(_paths[pathIdx].packetsReceivedSinceLastQoS, ZT_QOS_TABLE_SIZE); - // debug("numRecords=%3d, packetsReceivedSinceLastQoS=%3d, _paths[pathIdx].qosStatsIn.size()=%3lu", numRecords, _paths[pathIdx].packetsReceivedSinceLastQoS, _paths[pathIdx].qosStatsIn.size()); + // debug("numRecords=%3d, packetsReceivedSinceLastQoS=%3d, _paths[pathIdx].qosStatsIn.size()=%3zu", numRecords, _paths[pathIdx].packetsReceivedSinceLastQoS, _paths[pathIdx].qosStatsIn.size()); while (i < numRecords && it != _paths[pathIdx].qosStatsIn.end()) { uint64_t id = it->first; memcpy(qosBuffer, &id, sizeof(uint64_t)); @@ -582,7 +583,7 @@ bool Bond::assignFlowToBondedPath(SharedPtr& flow, int64_t now, bool reass int nextBestQualIdx = ZT_MAX_PEER_NETWORK_PATHS; if (reassign) { - log("attempting to re-assign out-flow %04x previously on idx %d (%u / %lu flows)", flow->id, flow->assignedPath, _paths[_realIdxMap[flow->assignedPath]].assignedFlowCount, _flows.size()); + log("attempting to re-assign out-flow %04x previously on idx %d (%u / %zu flows)", flow->id, flow->assignedPath, _paths[_realIdxMap[flow->assignedPath]].assignedFlowCount, _flows.size()); } else { debug("attempting to assign flow for the first time"); @@ -607,7 +608,7 @@ bool Bond::assignFlowToBondedPath(SharedPtr& flow, int64_t now, bool reass continue; } if (! _paths[_realIdxMap[bondedIdx]].shouldAvoid && randomLinkCapacity <= _paths[_realIdxMap[bondedIdx]].relativeLinkCapacity) { - // debug(" assign out-flow %04x to link %s (%u / %lu flows)", flow->id, pathToStr(_paths[_realIdxMap[bondedIdx]].p).c_str(), _paths[_realIdxMap[bondedIdx]].assignedFlowCount, _flows.size()); + // debug(" assign out-flow %04x to link %s (%u / %zu flows)", flow->id, pathToStr(_paths[_realIdxMap[bondedIdx]].p).c_str(), _paths[_realIdxMap[bondedIdx]].assignedFlowCount, _flows.size()); break; // Acceptable -- No violation of quality spec } if (_paths[_realIdxMap[bondedIdx]].relativeQuality > bestQuality) { @@ -636,7 +637,7 @@ bool Bond::assignFlowToBondedPath(SharedPtr& flow, int64_t now, bool reass } flow->assignPath(_abPathIdx, now); } - log("assign out-flow %04x to link %s (%u / %lu flows)", flow->id, pathToStr(_paths[flow->assignedPath].p).c_str(), _paths[flow->assignedPath].assignedFlowCount, _flows.size()); + log("assign out-flow %04x to link %s (%u / %zu flows)", flow->id, pathToStr(_paths[flow->assignedPath].p).c_str(), _paths[flow->assignedPath].assignedFlowCount, _flows.size()); return true; } @@ -660,7 +661,7 @@ SharedPtr Bond::createFlow(int pathIdx, int32_t flowId, unsigned cha if (pathIdx != ZT_MAX_PEER_NETWORK_PATHS) { flow->assignPath(pathIdx, now); _paths[pathIdx].assignedFlowCount++; - debug("assign in-flow %04x to link %s (%u / %lu)", flow->id, pathToStr(_paths[pathIdx].p).c_str(), _paths[pathIdx].assignedFlowCount, _flows.size()); + debug("assign in-flow %04x to link %s (%u / %zu)", flow->id, pathToStr(_paths[pathIdx].p).c_str(), _paths[pathIdx].assignedFlowCount, _flows.size()); } /** * Add a flow when no path was provided. This means that it is an outgoing packet @@ -680,7 +681,7 @@ void Bond::forgetFlowsWhenNecessary(uint64_t age, bool oldest, int64_t now) if (age) { // Remove by specific age while (it != _flows.end()) { if (it->second->age(now) > age) { - debug("forget flow %04x (age %llu) (%u / %lu)", it->first, (unsigned long long)it->second->age(now), _paths[it->second->assignedPath].assignedFlowCount, (_flows.size() - 1)); + debug("forget flow %04x (age %" PRId64 ") (%u / %zu)", it->first, it->second->age(now), _paths[it->second->assignedPath].assignedFlowCount, (_flows.size() - 1)); _paths[it->second->assignedPath].assignedFlowCount--; it = _flows.erase(it); } @@ -699,7 +700,7 @@ void Bond::forgetFlowsWhenNecessary(uint64_t age, bool oldest, int64_t now) ++it; } if (oldestFlow != _flows.end()) { - debug("forget oldest flow %04x (age %llu) (total flows: %lu)", oldestFlow->first, (unsigned long long)oldestFlow->second->age(now), (unsigned long)(_flows.size() - 1)); + debug("forget oldest flow %04x (age %" PRId64 ") (total flows: %zu)", oldestFlow->first, oldestFlow->second->age(now), _flows.size() - 1); _paths[oldestFlow->second->assignedPath].assignedFlowCount--; _flows.erase(oldestFlow); } @@ -824,7 +825,7 @@ void Bond::sendACK(void* tPtr, int pathIdx, int64_t localSocket, const InetAddre bytesToAck += it->second; ++it; } - debug("sending ACK of %d bytes on path %s (table size = %d)", bytesToAck, pathToStr(_paths[pathIdx].p).c_str(), _paths[pathIdx].ackStatsIn.size()); + debug("sending ACK of %d bytes on path %s (table size = %zu)", bytesToAck, pathToStr(_paths[pathIdx].p).c_str(), _paths[pathIdx].ackStatsIn.size()); outp.append(bytesToAck); if (atAddress) { outp.armor(_peer->key(), false, _peer->aesKeysIfSupported()); @@ -1919,7 +1920,7 @@ std::string Bond::pathToStr(const SharedPtr& path) SharedPtr link = getLink(path); if (link) { std::string ifnameStr = std::string(link->ifname()); - snprintf(fullPathStr, 384, "%.16llx-%s/%s", (unsigned long long)(path->localSocket()), ifnameStr.c_str(), pathStr); + snprintf(fullPathStr, 384, "%.16" PRIx64 "-%s/%s", path->localSocket(), ifnameStr.c_str(), pathStr); return std::string(fullPathStr); } } @@ -1935,11 +1936,11 @@ void Bond::dumpPathStatus(int64_t now, int pathIdx) std::string aliveOrDead = _paths[pathIdx].alive ? std::string("alive") : std::string("dead"); std::string eligibleOrNot = _paths[pathIdx].eligible ? std::string("eligible") : std::string("ineligible"); std::string bondedOrNot = _paths[pathIdx].bonded ? std::string("bonded") : std::string("unbonded"); - log("path[%2u] --- %5s (in %7lld, out: %7lld), %10s, %8s, flows=%-6u lat=%-8.3f pdv=%-7.3f err=%-6.4f loss=%-6.4f qual=%-6.4f --- (%s) spare=%d", + log("path[%2u] --- %5s (in %7" PRId64 ", out: %7" PRId64 "), %10s, %8s, flows=%-6u lat=%-8.3f pdv=%-7.3f err=%-6.4f loss=%-6.4f qual=%-6.4f --- (%s) spare=%d", pathIdx, aliveOrDead.c_str(), - static_cast(_paths[pathIdx].p->age(now)), - static_cast(_paths[pathIdx].p->_lastOut == 0 ? 0 : now - _paths[pathIdx].p->_lastOut), + _paths[pathIdx].p->age(now), + _paths[pathIdx].p->_lastOut == 0 ? static_cast(0) : now - _paths[pathIdx].p->_lastOut, eligibleOrNot.c_str(), bondedOrNot.c_str(), _paths[pathIdx].assignedFlowCount, @@ -1963,13 +1964,13 @@ void Bond::dumpInfo(int64_t now, bool force) _lastSummaryDump = now; float overhead = (_overheadBytes / (timeSinceLastDump / 1000.0f) / 1000.0f); _overheadBytes = 0; - log("bond: bp=%d, fi=%d, mi=%d, ud=%d, dd=%d, flows=%lu, leaf=%d, overhead=%f KB/s, links=(%d/%d)", + log("bond: bp=%d, fi=%" PRIu64 ", mi=%d, ud=%d, dd=%d, flows=%zu, leaf=%d, overhead=%f KB/s, links=(%d/%d)", _policy, _failoverInterval, _monitorInterval, _upDelay, _downDelay, - (unsigned long)_flows.size(), + _flows.size(), _isLeaf, overhead, _numAliveLinks, From ebc1ed40158eadf8f9da6a28e337a9ba6058f8cd Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 1 Dec 2022 11:07:20 -0500 Subject: [PATCH 05/10] Hide warning about readdir_r for now. --- osdep/OSUtils.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/osdep/OSUtils.cpp b/osdep/OSUtils.cpp index ab3f1078b..36814523a 100644 --- a/osdep/OSUtils.cpp +++ b/osdep/OSUtils.cpp @@ -43,6 +43,10 @@ #include "OSUtils.hpp" +#ifdef __GCC__ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + namespace ZeroTier { unsigned int OSUtils::ztsnprintf(char *buf,unsigned int len,const char *fmt,...) From 85c032231382cc86cec7443f79c59042d9271e74 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Thu, 1 Dec 2022 15:12:54 -0800 Subject: [PATCH 06/10] Fix TCP relay setting --- service/OneService.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/OneService.cpp b/service/OneService.cpp index daba4d99b..4cebe9fd2 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -2112,7 +2112,7 @@ public: // bondingPolicy cannot be used with allowTcpFallbackRelay _allowTcpFallbackRelay = OSUtils::jsonBool(settings["allowTcpFallbackRelay"],true); #ifdef ZT_TCP_FALLBACK_RELAY - _fallbackRelayAddress = InetAddress(OSUtils::jsonString("tcpFallbackRelay", ZT_TCP_FALLBACK_RELAY).c_str()); + _fallbackRelayAddress = InetAddress(OSUtils::jsonString(settings["tcpFallbackRelay"], ZT_TCP_FALLBACK_RELAY).c_str()); #endif _primaryPort = (unsigned int)OSUtils::jsonInt(settings["primaryPort"],(uint64_t)_primaryPort) & 0xffff; _allowSecondaryPort = OSUtils::jsonBool(settings["allowSecondaryPort"],true); From cdf248b1e2333f914fcecb8dabc651914f2a65d7 Mon Sep 17 00:00:00 2001 From: Brenton Bostick Date: Mon, 5 Dec 2022 09:56:13 -0500 Subject: [PATCH 07/10] Fix build problem related to unified headers Since NDKr15 (released 2017), unified headers are used by default [1] Remove -isystem option that was passing bad values to command-line. The actual value being passed to command-line was: ``` -isystem DK/sysroot/usr/include/RIPLE ``` because of using $NDK and $TRIPLE instead of $(NDK) and $(TRIPLE) But regardless, $NDK and $TRIPLE were never actually defined values and were just place-holders mentioned in [1] [1] https://android.googlesource.com/platform/ndk/+/ndk-release-r16/docs/UnifiedHeaders.md --- java/jni/Android.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/java/jni/Android.mk b/java/jni/Android.mk index 952bc4328..9f3434b7d 100644 --- a/java/jni/Android.mk +++ b/java/jni/Android.mk @@ -11,15 +11,13 @@ LOCAL_C_INCLUDES := \ LOCAL_LDLIBS := -llog # LOCAL_CFLAGS := -g -APP_UNIFIED_HEADERS := true - LOCAL_CFLAGS := -DZT_USE_MINIUPNPC ifeq ($(TARGET_ARCH_ABI),x86_64) LOCAL_CXXFLAGS := -maes -mpclmul -msse3 -msse4.1 endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) LOCAL_ARM_NEON := true - LOCAL_CXXFLAGS := -march=armv8-a+crypto -mfloat-abi=softfp -mfpu=neon -maes -isystem $NDK/sysroot/usr/include/$TRIPLE + LOCAL_CXXFLAGS := -march=armv8-a+crypto -mfloat-abi=softfp -mfpu=neon -maes endif # ZeroTierOne SDK source files From 475281935ec1026ac7a5d4349071e1bbe1e30fd5 Mon Sep 17 00:00:00 2001 From: Brenton Bostick Date: Mon, 5 Dec 2022 10:08:01 -0500 Subject: [PATCH 08/10] Remove unused flags for arm64-v8a Through using ndk-build, -Wno-unused-command-line-argument is passed in somewhere in the pipeline and hides this warning. The warning can be turned on with: APP_CPPFLAGS := -Wunused-command-line-argument ... and then when building, you can see: C/C++: clang++: warning: argument unused during compilation: '-mfloat-abi=softfp' [-Wunused-command-line-argument] C/C++: clang++: warning: argument unused during compilation: '-mfpu=neon' [-Wunused-command-line-argument] C/C++: clang++: warning: argument unused during compilation: '-maes' [-Wunused-command-line-argument] These are unused because both floating-point and NEON are required in all standard ARMv8 implementations. [1] [2] [1] https://developer.arm.com/documentation/den0024/a/AArch64-Floating-point-and-NEON [2] https://stackoverflow.com/a/29891469 --- java/jni/Android.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/java/jni/Android.mk b/java/jni/Android.mk index 9f3434b7d..c2e51e2f0 100644 --- a/java/jni/Android.mk +++ b/java/jni/Android.mk @@ -16,8 +16,7 @@ ifeq ($(TARGET_ARCH_ABI),x86_64) LOCAL_CXXFLAGS := -maes -mpclmul -msse3 -msse4.1 endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) - LOCAL_ARM_NEON := true - LOCAL_CXXFLAGS := -march=armv8-a+crypto -mfloat-abi=softfp -mfpu=neon -maes + LOCAL_CXXFLAGS := -march=armv8-a+crypto endif # ZeroTierOne SDK source files From 77c7f9133f1530580978e676bf56b18126a5ccc6 Mon Sep 17 00:00:00 2001 From: Brenton Bostick Date: Mon, 5 Dec 2022 10:08:26 -0500 Subject: [PATCH 09/10] Migrate from ndk-build to CMake --- java/jni/Android.mk | 63 ----------------------------------------- java/jni/Application.mk | 5 ---- 2 files changed, 68 deletions(-) delete mode 100644 java/jni/Android.mk delete mode 100644 java/jni/Application.mk diff --git a/java/jni/Android.mk b/java/jni/Android.mk deleted file mode 100644 index c2e51e2f0..000000000 --- a/java/jni/Android.mk +++ /dev/null @@ -1,63 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := ZeroTierOneJNI -LOCAL_C_INCLUDES := \ - $(ZT1)/include \ - $(ZT1)/node \ - $(ZT1)/osdep - -LOCAL_LDLIBS := -llog -# LOCAL_CFLAGS := -g - -LOCAL_CFLAGS := -DZT_USE_MINIUPNPC -ifeq ($(TARGET_ARCH_ABI),x86_64) - LOCAL_CXXFLAGS := -maes -mpclmul -msse3 -msse4.1 -endif -ifeq ($(TARGET_ARCH_ABI),arm64-v8a) - LOCAL_CXXFLAGS := -march=armv8-a+crypto -endif - -# ZeroTierOne SDK source files -LOCAL_SRC_FILES := \ - $(ZT1)/node/AES.cpp \ - $(ZT1)/node/AES_aesni.cpp \ - $(ZT1)/node/AES_armcrypto.cpp \ - $(ZT1)/node/Bond.cpp \ - $(ZT1)/node/C25519.cpp \ - $(ZT1)/node/Capability.cpp \ - $(ZT1)/node/CertificateOfMembership.cpp \ - $(ZT1)/node/CertificateOfOwnership.cpp \ - $(ZT1)/node/Identity.cpp \ - $(ZT1)/node/IncomingPacket.cpp \ - $(ZT1)/node/InetAddress.cpp \ - $(ZT1)/node/Membership.cpp \ - $(ZT1)/node/Multicaster.cpp \ - $(ZT1)/node/Network.cpp \ - $(ZT1)/node/NetworkConfig.cpp \ - $(ZT1)/node/Node.cpp \ - $(ZT1)/node/OutboundMulticast.cpp \ - $(ZT1)/node/Packet.cpp \ - $(ZT1)/node/Path.cpp \ - $(ZT1)/node/Peer.cpp \ - $(ZT1)/node/Poly1305.cpp \ - $(ZT1)/node/Revocation.cpp \ - $(ZT1)/node/Salsa20.cpp \ - $(ZT1)/node/SelfAwareness.cpp \ - $(ZT1)/node/SHA512.cpp \ - $(ZT1)/node/Switch.cpp \ - $(ZT1)/node/Tag.cpp \ - $(ZT1)/node/Topology.cpp \ - $(ZT1)/node/Trace.cpp \ - $(ZT1)/node/Utils.cpp \ - $(ZT1)/osdep/OSUtils.cpp - -# JNI Files -LOCAL_SRC_FILES += \ - com_zerotierone_sdk_Node.cpp \ - ZT_jniarray.cpp \ - ZT_jniutils.cpp \ - ZT_jnilookup.cpp - -include $(BUILD_SHARED_LIBRARY) \ No newline at end of file diff --git a/java/jni/Application.mk b/java/jni/Application.mk deleted file mode 100644 index 7980d8c27..000000000 --- a/java/jni/Application.mk +++ /dev/null @@ -1,5 +0,0 @@ -# NDK_TOOLCHAIN_VERSION := clang3.5 -APP_STL := c++_static -APP_CPPFLAGS := -Wall -fstack-protector -fexceptions -fno-strict-aliasing -frtti -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1 -DZT_SSO_SUPPORTED=0 -DOMIT_JSON_SUPPORT=1 -APP_PLATFORM := android-21 -APP_ABI := all From 5b5f9a069aec62e26d06afbc0c41d50c42b99716 Mon Sep 17 00:00:00 2001 From: Brenton Bostick Date: Thu, 1 Dec 2022 09:24:33 -0500 Subject: [PATCH 10/10] fix typos --- RELEASE-NOTES.md | 2 +- include/ZeroTierOne.h | 4 ++-- java/README.md | 2 +- node/Path.hpp | 2 +- selftest.cpp | 2 +- service/OneService.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index f57e9820e..a925a3a04 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -32,7 +32,7 @@ Note that releases are coming few and far between because most of our dev effort # 2022-04-25 -- Version 1.8.9 - * Fixed a long-standing and strange bug that was causing sporadic "phantom" packet authentication failures. Not a security problem but could be behind spordaic reports of link failures under some conditions. + * Fixed a long-standing and strange bug that was causing sporadic "phantom" packet authentication failures. Not a security problem but could be behind sporadic reports of link failures under some conditions. * Fized a memory leak in SSO/OIDC support. * Fixed SSO/OIDC display error on CLI. * Fixed a bug causing nodes to sometimes fail to push certs to each other (primarily affects SSO/OIDC use cases). diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index b8b23825f..23f97b388 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -1208,7 +1208,7 @@ typedef struct bool ssoEnabled; /** - * SSO verison + * SSO version */ uint64_t ssoVersion; @@ -2066,7 +2066,7 @@ ZT_SDK_API int ZT_Node_sendUserMessage(ZT_Node *node,void *tptr,uint64_t dest,ui * NetworkConfigMaster base class in node/. No type checking is performed, * so a pointer to anything else will result in a crash. * - * @param node ZertTier One node + * @param node ZeroTier One node * @param networkConfigMasterInstance Instance of NetworkConfigMaster C++ class or NULL to disable * @return OK (0) or error code if a fatal error condition has occurred */ diff --git a/java/README.md b/java/README.md index 2650ec3df..979101c5e 100644 --- a/java/README.md +++ b/java/README.md @@ -5,7 +5,7 @@ ZeroTier One SDK - Android JNI Wrapper Building ----- -Reqires: +Requires: * JDK * ANT diff --git a/node/Path.hpp b/node/Path.hpp index 11a3e5113..8304f27d8 100644 --- a/node/Path.hpp +++ b/node/Path.hpp @@ -194,7 +194,7 @@ public: */ inline unsigned int preferenceRank() const { - // This causes us to rank paths in order of IP scope rank (see InetAdddress.hpp) but + // This causes us to rank paths in order of IP scope rank (see InetAddress.hpp) but // within each IP scope class to prefer IPv6 over IPv4. return ( ((unsigned int)_ipScope << 1) | (unsigned int)(_addr.ss_family == AF_INET6) ); } diff --git a/selftest.cpp b/selftest.cpp index f43cee1af..cc161777b 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -667,7 +667,7 @@ static int testPacket() std::cout << "(compressed: " << complen << ", decompressed: " << a.size() << ") "; if (a != b) { - std::cout << "FAIL (compresssion)" << std::endl; + std::cout << "FAIL (compression)" << std::endl; return -1; } diff --git a/service/OneService.cpp b/service/OneService.cpp index 4cebe9fd2..5984b8b86 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1401,7 +1401,7 @@ public: /* Note: this is kind of restricted in what it'll take. It does not support * URL encoding, and /'s in URL args will screw it up. But the only URL args - * it really uses in ?jsonp=funcionName, and otherwise it just takes simple + * it really uses in ?jsonp=functionName, and otherwise it just takes simple * paths to simply-named resources. */ if (!ps.empty()) { std::size_t qpos = ps[ps.size() - 1].find('?');