Skip to content

Commit ba24c5a

Browse files
authored
Merge pull request #71 from jinnoflife/chore/githubRefs
chore: [noticket] Misc changes regarding release
2 parents 272ae2b + 0ae4890 commit ba24c5a

File tree

8 files changed

+13
-9
lines changed

8 files changed

+13
-9
lines changed

.envrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
1+
source_url "https://raw.githubusercontent.com/cachix/devenv/v0.6.3/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
22

3-
use devenv
3+
use devenv

.github/workflows/test_examples.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -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.0,${GITHUB_REPOSITORY}?ref=${GITHUB_REF_NAME}," devenv.yaml
48+
sed -i "s,kellerkinderDE/devenv-shopware?ref=v1.0.1,${GITHUB_REPOSITORY}?ref=${GITHUB_REF_NAME}," devenv.yaml
4949
echo running on ${GITHUB_REPOSITORY} with ref ${GITHUB_REF_NAME}
5050
direnv allow && direnv reload
5151
devenv ci -vvv

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ tightly tailored to the needs of our team members working on various projects wi
1414
- Inherits all default devenv features and services
1515
- Pre-installed [shopware-cli](https://sw-cli.fos.gg/)
1616

17+
## Requirements
18+
* devenv: `v0.6.3` or higher
19+
1720
## Setup & Usage
1821
A description about the setup and usage can be found in the [Wiki](https://github.com/kellerkinderDE/devenv-shopware/wiki).
1922

docs/Update.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# Updates
22

33
## v1.0.0
4+
* You have to update to devenv version `0.6.3` or higher
45
* You have to remove `http`, `https` and the ports (e.g. `8000`) from `kellerkinder.additionalServerAlias`
56
* You have to adjust your `devenv.yaml` to
67
```yml
78
...
89
kellerkinder:
9-
url: git+https://github.com/kellerkinderDE/devenv-shopware?ref=v1.0.0
10+
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.0
1011
flake: false
1112
...
1213
```

examples/sw5/.envrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
1+
source_url "https://raw.githubusercontent.com/cachix/devenv/v0.6.3/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
22

3-
use devenv
3+
use devenv

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: git+https://github.com/kellerkinderDE/devenv-shopware?ref=v1.0.0
8+
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.1
99
flake: false
1010
phps:
1111
url: github:fossar/nix-phps

examples/sw6/.envrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
1+
source_url "https://raw.githubusercontent.com/cachix/devenv/v0.6.3/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
22

33
use devenv

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: git+https://github.com/kellerkinderDE/devenv-shopware?ref=v1.0.0
8+
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.1
99
flake: false
1010
phps:
1111
url: github:fossar/nix-phps

0 commit comments

Comments
 (0)