From bd2f0fee2b2e099feeab861501c8f5ecb4dd581f Mon Sep 17 00:00:00 2001
From: Scott Mabin <scott@mabez.dev>
Date: Tue, 20 Jun 2023 14:38:59 +0200
Subject: [PATCH] Pin log crate to 0.4.18

This is temporary measure, as the problem cannot be solved cleanly right
now.

The issue is that the msrv check uses the stable compiler, which uses a
stable cargo. With a stable cargo, the unstable `build-std` option is
not respected within `.cargo/config.toml`. This means `core` is never
rebuilt with the atomic cfg flags so we get this error when building log
version 0.4.19. The 0.4.19 release uses the atomic cfg flags instead of
a custom build script, so by switching back to 0.4.188888888 we can avoid this
issue... for now at least.
---
 CHANGELOG.md              | 1 +
 esp-hal-common/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f226f5a32..50d0cc339 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - ESP32-C3: Fix GPIO5 ADC channel id (#562)
 - ESP32-H2: Fix direct-boot feature
 - ESP32-C6: Support FOSC CLK calibration for ECO1+ chip revisions
+- Fixed CI by pinning the log crate to 0.4.18 (#600)
 
 ### Changed
 
diff --git a/esp-hal-common/Cargo.toml b/esp-hal-common/Cargo.toml
index 4ab8e48e2..40a85dfa9 100644
--- a/esp-hal-common/Cargo.toml
+++ b/esp-hal-common/Cargo.toml
@@ -22,7 +22,7 @@ embedded-hal-1       = { version = "=1.0.0-alpha.10", optional = true, package =
 embedded-hal-nb      = { version = "=1.0.0-alpha.2", optional = true }
 esp-synopsys-usb-otg = { version = "0.3.1", optional = true, features = ["fs", "esp32sx"] }
 fugit                = "0.3.6"
-log                  = "0.4.17"
+log                  = "=0.4.18"
 lock_api             = { version = "0.4.9", optional = true }
 nb                   = "1.1.0"
 paste                = "1.0.12"