Skip to content

Commit

Permalink
Merge pull request #98 from lx-wnk/chore/prepare-release
Browse files Browse the repository at this point in the history
Release preparations for 2.2.0
  • Loading branch information
kleinmann authored Apr 9, 2024
2 parents 3f16d7e + 50a21b9 commit 8d6f4c2
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 4 deletions.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,17 @@ tightly tailored to the needs of our team members working on various projects wi
- Pre-installed [shopware-cli](https://sw-cli.fos.gg/)

## Requirements
* devenv: `v0.6.3` or higher
* devenv: `v1.0.3` or higher

## Setup & Usage
A description about the setup and usage can be found in the [Wiki](https://github.com/kellerkinderDE/devenv-shopware/wiki).

### Multiple Projects
If you want to run multiple projects at same time, you may need to choose a different `process.implementation` instead of `process-compose`.
This would be possible by adding `process.implementation = "honcho";` to your `devenv.nix`.

A complete list of possible options can be found [here](https://devenv.sh/reference/options/#processimplementation)

### Update
To update your devenv config to the latest version, simply follow the update instructions for the new version in the [Wiki](https://github.com/kellerkinderDE/devenv-shopware/wiki/Update)

Expand Down
2 changes: 1 addition & 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 = "v2.1.1";
currentVersion = "v2.2.0";

listEntries = path:
map (name: path + "/${name}") (builtins.attrNames (builtins.readDir path));
Expand Down
11 changes: 11 additions & 0 deletions docs/Update.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Updates

## v2.2.0
* You have to adjust your `devenv.yaml` to
```yml
...
kellerkinder:
url: github:kellerkinderDE/devenv-shopware?ref=v2.2.0
flake: false
...
```
* If you want to run multiple projects at the same time, you may have to consider adding `process.implementation = "honcho";` to your `devenv.nix` as the default [process manager in devenv](https://devenv.sh/reference/options/#processimplementation) has changed.

## v2.1.0
* We support now the newest version of [shopware-cli](https://github.com/FriendsOfShopware/shopware-cli/releases), which be installed directly. To do this, you just need to adjust the following in your `devenv.yaml`
```yml
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-23.11
kellerkinder:
url: github:kellerkinderDE/devenv-shopware?ref=v2.1.1
url: github:kellerkinderDE/devenv-shopware?ref=v2.2.0
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-23.11
kellerkinder:
url: github:kellerkinderDE/devenv-shopware?ref=v2.1.1
url: github:kellerkinderDE/devenv-shopware?ref=v2.2.0
flake: false
froshpkgs:
url: github:FriendsOfShopware/nur-packages
Expand Down

0 comments on commit 8d6f4c2

Please sign in to comment.