Skip to content

Commit

Permalink
Merge pull request #71 from jinnoflife/chore/githubRefs
Browse files Browse the repository at this point in the history
chore: [noticket] Misc changes regarding release
  • Loading branch information
jochenmanz authored Oct 9, 2023
2 parents 272ae2b + 0ae4890 commit ba24c5a
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
source_url "https://raw.githubusercontent.com/cachix/devenv/v0.6.3/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="

use devenv
use devenv
2 changes: 1 addition & 1 deletion .github/workflows/test_examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0,${GITHUB_REPOSITORY}?ref=${GITHUB_REF_NAME}," devenv.yaml
sed -i "s,kellerkinderDE/devenv-shopware?ref=v1.0.1,${GITHUB_REPOSITORY}?ref=${GITHUB_REF_NAME}," devenv.yaml
echo running on ${GITHUB_REPOSITORY} with ref ${GITHUB_REF_NAME}
direnv allow && direnv reload
devenv ci -vvv
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ tightly tailored to the needs of our team members working on various projects wi
- Inherits all default devenv features and services
- Pre-installed [shopware-cli](https://sw-cli.fos.gg/)

## Requirements
* devenv: `v0.6.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).

Expand Down
3 changes: 2 additions & 1 deletion docs/Update.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Updates

## v1.0.0
* You have to update to devenv version `0.6.3` or higher
* You have to remove `http`, `https` and the ports (e.g. `8000`) from `kellerkinder.additionalServerAlias`
* You have to adjust your `devenv.yaml` to
```yml
...
kellerkinder:
url: git+https://github.com/kellerkinderDE/devenv-shopware?ref=v1.0.0
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.0
flake: false
...
```
Expand Down
4 changes: 2 additions & 2 deletions examples/sw5/.envrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
source_url "https://raw.githubusercontent.com/cachix/devenv/v0.6.3/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="

use devenv
use devenv
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: git+https://github.com/kellerkinderDE/devenv-shopware?ref=v1.0.0
url: github:kellerkinderDE/devenv-shopware?ref=v1.0.1
flake: false
phps:
url: github:fossar/nix-phps
Expand Down
2 changes: 1 addition & 1 deletion examples/sw6/.envrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="
source_url "https://raw.githubusercontent.com/cachix/devenv/v0.6.3/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="

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

0 comments on commit ba24c5a

Please sign in to comment.