From 3e7af7045b6e822df85699ecda03963c10b95746 Mon Sep 17 00:00:00 2001 From: ezkrg Date: Tue, 5 Apr 2022 15:44:17 +0200 Subject: let arm build in debian based image --- .drone.yml | 2 -- matrix-e2e.c.patch | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 matrix-e2e.c.patch diff --git a/.drone.yml b/.drone.yml index f61c2f1..3a5c21c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,6 @@ steps: DOCKER_HOST: tcp://docker:2375 commands: - while ! docker info; do sleep 1; done - - docker run --rm --privileged tonistiigi/binfmt --install all - docker buildx create --use --name docker --node docker --platform linux/amd64 --driver docker-container $DOCKER_HOST - echo $PASSWORD | docker login --username $USER --password-stdin - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache -t ezkrg/bitlbee-libpurple:test --platform linux/amd64 . @@ -38,7 +37,6 @@ steps: DOCKER_HOST: tcp://docker:2375 commands: - while ! docker info; do sleep 1; done - - docker run --rm --privileged tonistiigi/binfmt --install all - docker buildx create --use --name docker --node docker --platform linux/amd64--driver docker-container $DOCKER_HOST - echo $PASSWORD | docker login --username $USER --password-stdin - docker buildx build --push --cache-from ezkrg/bitlbee-libpurple:cache --cache-to ezkrg/bitlbee-libpurple:cache -t ezkrg/bitlbee-libpurple:$DRONE_TAG -t ezkrg/bitlbee-libpurple:latest --platform linux/amd64 . diff --git a/matrix-e2e.c.patch b/matrix-e2e.c.patch new file mode 100644 index 0000000..8dd7c47 --- /dev/null +++ b/matrix-e2e.c.patch @@ -0,0 +1,20 @@ +--- matrix-e2e.c ++++ matrix-e2e.c.new +@@ -949,7 +949,7 @@ + to_create = (max_keys / 2) - count; + need_to_send = TRUE; + } +- purple_debug_info("matrixprpl", "%s: %s: %ld\n", ++ purple_debug_info("matrixprpl", "%s: %s: %lld\n", + __func__, key_algo, count); + } + } +@@ -1520,7 +1520,7 @@ + plaintext[pt_len] = '\0'; + handle_decrypted_olm(pc, conn, cevent_sender, sender_key, plaintext); + } else { +- purple_debug_info("matrixprpl", "%s: Type %zd olm\n", __func__, type); ++ purple_debug_info("matrixprpl", "%s: Type %lld olm\n", __func__, type); + } + if (plaintext) { + clear_mem(plaintext, max_plaintext_len); \ No newline at end of file -- cgit v1.2.3