From 215952a8dd8149da1239a7120fcda9263d2cd7d5 Mon Sep 17 00:00:00 2001 From: finn Date: Tue, 13 Sep 2022 15:58:03 -0700 Subject: [PATCH] add aarch64-apple-darwin target --- .gitlab-ci.yml | 9 ++++++--- hashes.json | 32 ++++++++++++++++++-------------- update-hashes.py | 3 ++- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e80526d..264f7a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,10 +20,13 @@ build: - x86_64-unknown-linux-gnu - x86_64-unknown-linux-musl -build x86_64-apple-darwin: +build darwin: stage: build tags: [darwin-builder] script: - ./build.sh - variables: - TARGET: x86_64-apple-darwin \ No newline at end of file + parallel: + matrix: + - TARGET: + - x86_64-apple-darwin + - aarch64-apple-darwin diff --git a/hashes.json b/hashes.json index a8a7724..11e4ed7 100644 --- a/hashes.json +++ b/hashes.json @@ -1,30 +1,34 @@ { "aarch64-unknown-linux-gnu": { - "jar": "0655a334d0cb9281536578c374d1a370c6153164fbba3719320e6a731b4db00e", - "module": "608bdadffc100797831e87d71e1e050e61e042db9032acca53f6357491c0ab2d" + "jar": "802529c1472f7e621cca496c918d7bfec08314572f10e168b0d20b15a5b8101a", + "module": "48e315037d2d9af6c7cf7b811d9a81d81b1eff13cbb1837b7638a3803b68f303" }, "arm-unknown-linux-gnueabi": { - "jar": "045603c735f6856eef7184c3480e3d9be6d513dc547a6583b014e74646da6826", - "module": "77e4f0f516577de0511f9b631b21820538d10cad0fef87f8918df4122c8ba73b" + "jar": "8ef66fe1ae28fe7b2918292824ef33a41a3432c3a981cfa55665106c89348327", + "module": "7c988dfb2fca57ff0aabd7bd88ebfa5658be8722adb0831a5140aed3d1529097" }, "arm-unknown-linux-gnueabihf": { - "jar": "5cd241208f489ba051d7e215abe5a32e31daf3b067ead5845b9b5640c61629ad", - "module": "6d3b60d27fe87d9b3c7738c0df873967f205bf01839ce2f79cfcbcb1638851db" + "jar": "446a796b0a2a062c65d9d5cb75a3fd4aadc03ab321b52c39a5bfe1e6f9dc9891", + "module": "30e6a82cc6d2b01b57b758d8352c9d90926f31becfe6218c43d2614a309c9cbc" }, "armv7-unknown-linux-gnueabihf": { - "jar": "0d26c8aa61baedff7cb3a487493469b9b1858f4e2e8c4836994deb566c1c8244", - "module": "b5753c4c91f36eb0495c3e9505d9826a776f3697523b0e9e81544d30904b5a37" + "jar": "3e896a52cf5816387094137403c112353de93f4b7591bcfc5965e89ef3777c5b", + "module": "39be083718c6b8afe94e2ccff63c918ea1255292881afbb60b12236cd4b70dc6" }, "x86_64-unknown-linux-gnu": { - "jar": "3a2516fcc468f462790648df25061386e2b3b9530f60aeed2b49b3bd0e9f8412", - "module": "98d297a13d9ac675d42982c864c2ad13d5574a97fe3afc5b8c75abaf61740189" + "jar": "b38295eb11df91939b872f49eb8b55b2faf7933da92202b95d82320f4cdcb644", + "module": "1b739335cde181864882481f5feca8fca3f7baa439f79c36ac596a781e6d4477" }, "x86_64-apple-darwin": { - "jar": "690745c6d40bbddbe1632c52942746428eafa6fdc02423f7c3d1d7ced5267777", - "module": "a596556990b0d0bad2da402cf2c6f0196ebd7f86e18477d6564c8b848be4ea93" + "jar": "949a72b14d81389a30e330db3162f822a475d0f19087590f334639acdb01b4eb", + "module": "7de5da969225585d36d68ba7a87c80d33886e36a04dea9d78ef8c2df9f6a3bf2" + }, + "aarch64-apple-darwin": { + "jar": "e7f405b1c521054bbea8ec0ff87c54527f17e8c914079d7805c4def3589e8af1", + "module": "3c153a7e01ae317280981e387d3fd002b7106ce65653be1b6e4216a4f4d9d314" }, "x86_64-unknown-linux-musl": { - "jar": "1c0fe36904814a5b5d27451b9f5dd1127f9feabb90a34ddf3e5cef0fc8c3d0da", - "module": "0a3bd042324fc8e6f868046785aacc6bed942cfe0e2a43141543568475bfed3b" + "jar": "9a46edb376089b6284cbc76c4e6bc21fa91f8ee7e3daf221d704243cfe0c16cf", + "module": "a35abf78dc674557ddc7da348d5eb2d015b4e843d5402df95922ba2780b36169" } } \ No newline at end of file diff --git a/update-hashes.py b/update-hashes.py index 893d980..6c808c9 100644 --- a/update-hashes.py +++ b/update-hashes.py @@ -11,7 +11,8 @@ TARGETS = [ "armv7-unknown-linux-gnueabihf", "x86_64-unknown-linux-gnu", "x86_64-apple-darwin", - "x86_64-unknown-linux-musl" + "x86_64-unknown-linux-musl", + "aarch64-apple-darwin" ] urlFormat = "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org/signald/libsignal-client-{target}/{version}/libsignal-client-{target}-{version}.{ext}"