Skip to content

Commit 60c8f21

Browse files
authored
Merge pull request #79 from kellerkinderDE/noticket/addNpmConfigEngineStrict
Add NPM_CONFIG_ENGINE_STRICT for new npm10
2 parents 9087f18 + ba41ccc commit 60c8f21

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.github/workflows/test_examples.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v3
2626
- id: set-matrix
27-
run: echo "matrix=$(ls examples/ | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
27+
run: echo "matrix=$(ls ${GITHUB_WORKSPACE}/examples/ | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
2828
test_examples:
2929
needs: list-examples
3030
runs-on: ubuntu-latest
@@ -45,7 +45,7 @@ jobs:
4545
- name: Test ${{ matrix.manifest }} example
4646
run: |
4747
cd ${GITHUB_WORKSPACE}/examples/${{ matrix.manifest }}
48-
sed -i "s,kellerkinderDE/devenv-shopware?ref=v1.0.2,${GITHUB_REPOSITORY}?ref=${GITHUB_REF_NAME}," devenv.yaml
48+
sed -i "s,url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3,url: path:${GITHUB_WORKSPACE}," devenv.yaml
4949
echo running on ${GITHUB_REPOSITORY} with ref ${GITHUB_REF_NAME}
5050
direnv allow && direnv reload
5151
devenv ci -vvv

devenv.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
let
33
cfg = config.kellerkinder;
44

5-
currentVersion = "v1.0.2";
5+
currentVersion = "v1.0.3";
66

77
listEntries = path:
88
map (name: path + "/${name}") (builtins.attrNames (builtins.readDir path));
@@ -205,6 +205,7 @@ in {
205205
SHOPWARE_CACHE_ID = "dev";
206206

207207
NODE_OPTIONS = "--openssl-legacy-provider --max-old-space-size=2000";
208+
NPM_CONFIG_ENGINE_STRICT = "false"; # hotfix for npm10
208209
})
209210
(lib.mkIf (config.services.elasticsearch.enable || config.services.opensearch.enable) {
210211
SHOPWARE_ES_ENABLED = "1";

examples/sw5/devenv.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inputs:
55
nixpkgs:
66
url: github:NixOS/nixpkgs/nixos-unstable
77
kellerkinder:
8-
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.2
8+
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3
99
flake: false
1010
phps:
1111
url: github:fossar/nix-phps

examples/sw6/devenv.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inputs:
55
nixpkgs:
66
url: github:NixOS/nixpkgs/nixos-unstable
77
kellerkinder:
8-
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.2
8+
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3
99
flake: false
1010
phps:
1111
url: github:fossar/nix-phps

0 commit comments

Comments
 (0)