Skip to content

Commit

Permalink
Merge pull request #79 from kellerkinderDE/noticket/addNpmConfigEngin…
Browse files Browse the repository at this point in the history
…eStrict

Add NPM_CONFIG_ENGINE_STRICT for new npm10
  • Loading branch information
lx-wnk authored Jan 8, 2024
2 parents 9087f18 + ba41ccc commit 60c8f21
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test_examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- id: set-matrix
run: echo "matrix=$(ls examples/ | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
run: echo "matrix=$(ls ${GITHUB_WORKSPACE}/examples/ | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
test_examples:
needs: list-examples
runs-on: ubuntu-latest
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Test ${{ matrix.manifest }} example
run: |
cd ${GITHUB_WORKSPACE}/examples/${{ matrix.manifest }}
sed -i "s,kellerkinderDE/devenv-shopware?ref=v1.0.2,${GITHUB_REPOSITORY}?ref=${GITHUB_REF_NAME}," devenv.yaml
sed -i "s,url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3,url: path:${GITHUB_WORKSPACE}," devenv.yaml
echo running on ${GITHUB_REPOSITORY} with ref ${GITHUB_REF_NAME}
direnv allow && direnv reload
devenv ci -vvv
Expand Down
3 changes: 2 additions & 1 deletion devenv.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
let
cfg = config.kellerkinder;

currentVersion = "v1.0.2";
currentVersion = "v1.0.3";

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

NODE_OPTIONS = "--openssl-legacy-provider --max-old-space-size=2000";
NPM_CONFIG_ENGINE_STRICT = "false"; # hotfix for npm10
})
(lib.mkIf (config.services.elasticsearch.enable || config.services.opensearch.enable) {
SHOPWARE_ES_ENABLED = "1";
Expand Down
2 changes: 1 addition & 1 deletion examples/sw5/devenv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inputs:
nixpkgs:
url: github:NixOS/nixpkgs/nixos-unstable
kellerkinder:
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.2
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3
flake: false
phps:
url: github:fossar/nix-phps
Expand Down
2 changes: 1 addition & 1 deletion examples/sw6/devenv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inputs:
nixpkgs:
url: github:NixOS/nixpkgs/nixos-unstable
kellerkinder:
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.2
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.3
flake: false
phps:
url: github:fossar/nix-phps
Expand Down

0 comments on commit 60c8f21

Please sign in to comment.