From ede5fc08652267f4191f1d671264ce301275a123 Mon Sep 17 00:00:00 2001 From: "Garen J. Torikian" Date: Sat, 12 Nov 2022 01:45:34 -0300 Subject: [PATCH 1/4] Add manual workflow dispatch --- .github/workflows/cruby-build-and-install.yml | 4 ++++ .github/workflows/generic-build-and-install.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/cruby-build-and-install.yml b/.github/workflows/cruby-build-and-install.yml index bd017238..4ba65783 100644 --- a/.github/workflows/cruby-build-and-install.yml +++ b/.github/workflows/cruby-build-and-install.yml @@ -4,9 +4,13 @@ concurrency: cancel-in-progress: true on: + workflow_dispatch: pull_request: paths: - "lib/commonmarker/version.rb" + push: + branches: + - "windows-build" jobs: cruby-package: diff --git a/.github/workflows/generic-build-and-install.yml b/.github/workflows/generic-build-and-install.yml index 5f17e599..ff7f27de 100644 --- a/.github/workflows/generic-build-and-install.yml +++ b/.github/workflows/generic-build-and-install.yml @@ -4,9 +4,13 @@ concurrency: cancel-in-progress: true on: + workflow_dispatch: pull_request: paths: - "lib/commonmarker/version.rb" + push: + branches: + - "windows-build" jobs: generic-package: From 6d365e257d7056d2559f379697b95e7688223450 Mon Sep 17 00:00:00 2001 From: "Garen J. Torikian" Date: Sat, 12 Nov 2022 01:46:13 -0300 Subject: [PATCH 2/4] Try new magnus backend --- Cargo.lock | 29 +++++++++++++---------------- ext/commonmarker/Cargo.toml | 4 ++-- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fdc9aae3..930b7c1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -414,28 +414,20 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" -[[package]] -name = "linkify" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5" -dependencies = [ - "memchr", -] - [[package]] name = "magnus" version = "0.3.2" -source = "git+https://github.com/gjtorikian/magnus?branch=main#467157e008ab807792795f05ed441e5f53c261ca" +source = "git+https://github.com/ianks/magnus?branch=rb-sys-env#9c048c69f3a60c71939cf5845fad74a222a4dc0b" dependencies = [ "magnus-macros", "rb-sys", + "rb-sys-env", ] [[package]] name = "magnus-macros" version = "0.1.0" -source = "git+https://github.com/gjtorikian/magnus?branch=main#467157e008ab807792795f05ed441e5f53c261ca" +source = "git+https://github.com/ianks/magnus?branch=rb-sys-env#9c048c69f3a60c71939cf5845fad74a222a4dc0b" dependencies = [ "darling", "proc-macro2", @@ -601,25 +593,30 @@ dependencies = [ [[package]] name = "rb-sys" -version = "0.9.34" +version = "0.9.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ff8b3a4d418f3604ac3781aee54a094f3f9d732fb9a2458f73a3937a9ea918" +checksum = "31bb5cd8565cd4dd97dcf7a04e3b4e5401ce379d34496c34e866ce806277a408" dependencies = [ "rb-sys-build", ] [[package]] name = "rb-sys-build" -version = "0.9.34" +version = "0.9.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2921dcd727615d4af5a6d39cc3c1c8c9dc8e37bf2b42d44b3e101a6da2bce17" +checksum = "de4bbf05b48f0c01b9b8e3b26f02769b097185b8d649831c652cb8a9946494a2" dependencies = [ "bindgen", - "linkify", "regex", "shell-words", ] +[[package]] +name = "rb-sys-env" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74c38752410925faeb82c400c06ba2fd9ee6aa8f719dd33994c9e53f5242d25f" + [[package]] name = "redox_syscall" version = "0.2.16" diff --git a/ext/commonmarker/Cargo.toml b/ext/commonmarker/Cargo.toml index 987a2482..29629793 100644 --- a/ext/commonmarker/Cargo.toml +++ b/ext/commonmarker/Cargo.toml @@ -4,8 +4,8 @@ version = "1.0.0" edition = "2021" [dependencies] -magnus = { git = "https://github.com/gjtorikian/magnus", branch = "main" } # waiting for release with full rb-sys backend -comrak = "0.14.0" +magnus = { git = "https://github.com/ianks/magnus", branch = "rb-sys-env" } # waiting for release with full rb-sys backend +comrak = "0.14" [lib] name = "commonmarker" From 3cf481e7f324fd2a754422bb49c590c315c6599d Mon Sep 17 00:00:00 2001 From: "Garen J. Torikian" Date: Wed, 30 Nov 2022 10:04:59 -0500 Subject: [PATCH 3/4] Pin to Magnus main --- Cargo.lock | 189 ++++++++++++++---------------------- ext/commonmarker/Cargo.toml | 2 +- 2 files changed, 76 insertions(+), 115 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 930b7c1c..f81d3aad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -45,9 +45,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bincode" @@ -109,9 +109,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cexpr" @@ -148,7 +148,7 @@ dependencies = [ "ansi_term", "atty", "bitflags", - "strsim 0.8.0", + "strsim", "textwrap", "unicode-width", "vec_map", @@ -210,46 +210,11 @@ dependencies = [ "typenum", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn", -] - [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer", "crypto-common", @@ -293,9 +258,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", @@ -319,9 +284,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", @@ -349,17 +314,11 @@ dependencies = [ "libc", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", @@ -385,15 +344,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.135" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -416,8 +375,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "magnus" -version = "0.3.2" -source = "git+https://github.com/ianks/magnus?branch=rb-sys-env#9c048c69f3a60c71939cf5845fad74a222a4dc0b" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d121e49c336dfcd00273aeeaf5609da7a6351d5816bac76daf4c30959fb36" dependencies = [ "magnus-macros", "rb-sys", @@ -426,10 +386,10 @@ dependencies = [ [[package]] name = "magnus-macros" -version = "0.1.0" -source = "git+https://github.com/ianks/magnus?branch=rb-sys-env#9c048c69f3a60c71939cf5845fad74a222a4dc0b" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acc8ba6908cb0f67a4e75cb48fc81a1f0e6a6dd1501936e0c9e2c7c8f9f18e05" dependencies = [ - "darling", "proc-macro2", "quote", "syn", @@ -449,9 +409,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -466,20 +426,11 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - [[package]] name = "once_cell" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "onig" @@ -511,9 +462,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pest" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" +checksum = "5f400b0f7905bf702f9f3dc3df5a121b16c54e9e8012c082905fdf09a931861a" dependencies = [ "thiserror", "ucd-trie", @@ -521,9 +472,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b75706b9642ebcb34dab3bc7750f811609a0eb1dd8b88c2d15bf628c1c65b2" +checksum = "423c2ba011d6e27b02b482a3707c773d19aec65cc024637aec44e19652e66f63" dependencies = [ "pest", "pest_generator", @@ -531,9 +482,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f9272122f5979a6511a749af9db9bfc810393f63119970d7085fed1c4ea0db" +checksum = "3e64e6c2c85031c02fdbd9e5c72845445ca0a724d419aa0bc068ac620c9935c1" dependencies = [ "pest", "pest_meta", @@ -544,9 +495,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8717927f9b79515e565a64fe46c38b8cd0427e64c40680b14a7365ab09ac8d" +checksum = "57959b91f0a133f89a68be874a5c88ed689c19cd729ecdb5d762ebf16c64d662" dependencies = [ "once_cell", "pest", @@ -555,9 +506,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "plist" @@ -593,18 +544,18 @@ dependencies = [ [[package]] name = "rb-sys" -version = "0.9.39" +version = "0.9.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31bb5cd8565cd4dd97dcf7a04e3b4e5401ce379d34496c34e866ce806277a408" +checksum = "31f48777b8161ff5c077ad74ce486ebe963ca8a92257512bab473b405a80d69f" dependencies = [ "rb-sys-build", ] [[package]] name = "rb-sys-build" -version = "0.9.39" +version = "0.9.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de4bbf05b48f0c01b9b8e3b26f02769b097185b8d649831c652cb8a9946494a2" +checksum = "a46785122aff7077527b78c2518d739c45dc0fbc410a2b8361076ff4bbf993f9" dependencies = [ "bindgen", "regex", @@ -639,9 +590,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -650,9 +601,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "rustc-hash" @@ -683,15 +634,15 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.145" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" dependencies = [ "proc-macro2", "quote", @@ -700,9 +651,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ "itoa", "ryu", @@ -738,17 +689,11 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "syn" -version = "1.0.102" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" dependencies = [ "proc-macro2", "quote", @@ -809,13 +754,29 @@ dependencies = [ [[package]] name = "time" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ "itoa", - "libc", - "num_threads", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", ] [[package]] diff --git a/ext/commonmarker/Cargo.toml b/ext/commonmarker/Cargo.toml index 29629793..fea04f6c 100644 --- a/ext/commonmarker/Cargo.toml +++ b/ext/commonmarker/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -magnus = { git = "https://github.com/ianks/magnus", branch = "rb-sys-env" } # waiting for release with full rb-sys backend +magnus = "0.4" comrak = "0.14" [lib] From 1aea2f744d6960b4dbe8807a591a4e66f469dfbb Mon Sep 17 00:00:00 2001 From: "Garen J. Torikian" Date: Wed, 30 Nov 2022 10:08:58 -0500 Subject: [PATCH 4/4] Bump version --- .github/workflows/cruby-build-and-install.yml | 3 --- .github/workflows/generic-build-and-install.yml | 3 --- lib/commonmarker/version.rb | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/cruby-build-and-install.yml b/.github/workflows/cruby-build-and-install.yml index 4ba65783..42a7982f 100644 --- a/.github/workflows/cruby-build-and-install.yml +++ b/.github/workflows/cruby-build-and-install.yml @@ -8,9 +8,6 @@ on: pull_request: paths: - "lib/commonmarker/version.rb" - push: - branches: - - "windows-build" jobs: cruby-package: diff --git a/.github/workflows/generic-build-and-install.yml b/.github/workflows/generic-build-and-install.yml index ff7f27de..96f0462d 100644 --- a/.github/workflows/generic-build-and-install.yml +++ b/.github/workflows/generic-build-and-install.yml @@ -8,9 +8,6 @@ on: pull_request: paths: - "lib/commonmarker/version.rb" - push: - branches: - - "windows-build" jobs: generic-package: diff --git a/lib/commonmarker/version.rb b/lib/commonmarker/version.rb index ed056702..4ed96fa2 100644 --- a/lib/commonmarker/version.rb +++ b/lib/commonmarker/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Commonmarker - VERSION = "1.0.0.pre.2" + VERSION = "1.0.0.pre3" end