This commit is contained in:
@@ -35,8 +35,5 @@ jobs:
|
||||
key: esphome-${{ hashFiles('*.yaml', 'templates/*.yaml', 'components/**') }}
|
||||
restore-keys: esphome-
|
||||
|
||||
# Uses the ci shell, which installs esphome via pipx at the exact version
|
||||
# pinned in Nix. The ci shell avoids nixpkgs wrapping platformio in bwrap,
|
||||
# which fails on CI runners that disallow unprivileged user namespaces.
|
||||
- name: Compile All
|
||||
run: nix develop .#ci --command make compile-all
|
||||
|
||||
@@ -57,20 +57,18 @@
|
||||
'';
|
||||
};
|
||||
|
||||
# CI shell: uses the same esphome version as default, but installs it
|
||||
# via pipx to avoid nixpkgs wrapping platformio in bwrap, which fails
|
||||
# CI shell: uses the same esphome version as default, but overrides
|
||||
# platformio to use platformio-core instead of the FHS-wrapped version.
|
||||
# This avoids nixpkgs wrapping platformio in bwrap, which fails
|
||||
# on CI runners that disallow unprivileged user namespaces.
|
||||
ci = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
python3
|
||||
python3Packages.pipx
|
||||
(esphome.override { platformio = platformio-core; })
|
||||
esptool
|
||||
gnumake
|
||||
];
|
||||
|
||||
shellHook = ''
|
||||
pipx install --quiet esphome==${pkgs.esphome.version}
|
||||
export PATH="$HOME/.local/bin:$PATH"
|
||||
echo -n "ESPHome (CI) "
|
||||
esphome --version
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user