Skip to content

Commit d6f541a

Browse files
committed
Add nats-server package
Signed-off-by: Casper Beyer <[email protected]>
1 parent 3221faf commit d6f541a

File tree

1 file changed

+32
-0
lines changed

1 file changed

+32
-0
lines changed

.github/workflows/test.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,13 @@ jobs:
4242
4343
- name: Run tests
4444
run: |
45+
<<<<<<< HEAD
4546
uv run flake8 --ignore="W391, W503, W504, E501" ./nats/src/nats/js/
4647
uv run pytest -x -vv -s --continue-on-collection-errors ./nats/tests
48+
=======
49+
pipenv run flake8 --ignore="W391, W503, W504" ./nats/js/
50+
pipenv run pytest -x -vv -s --continue-on-collection-errors ./tests
51+
>>>>>>> 44fb982 (Add nats-server package)
4752
env:
4853
PATH: $HOME/nats-server:$PATH
4954

@@ -53,24 +58,38 @@ jobs:
5358
strategy:
5459
matrix:
5560
python-version: ["3.11", "3.12", "3.13"]
61+
<<<<<<< HEAD
5662
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
63+
=======
64+
os: ["ubuntu-latest", "macos-latest"]
65+
>>>>>>> 44fb982 (Add nats-server package)
5766
nats-server-version: ["latest"]
5867
project: ["nats-server"]
5968
steps:
6069
- name: Checkout repository
70+
<<<<<<< HEAD
6171
uses: actions/checkout@v5
6272

6373
- name: Set up Go
6474
uses: actions/setup-go@v6
6575
with:
6676
go-version: "stable"
77+
=======
78+
uses: actions/checkout@v2
79+
80+
- name: Set up Go
81+
uses: actions/setup-go@v2
82+
with:
83+
go-version: "1.23.4"
84+
>>>>>>> 44fb982 (Add nats-server package)
6785

6886
- name: Install NATS Server
6987
run: |
7088
go install github.com/nats-io/nats-server/v2@${{ matrix.nats-server-version }}
7189
shell: bash
7290

7391
- name: Set up Python ${{ matrix.python-version }}
92+
<<<<<<< HEAD
7493
uses: actions/setup-python@v6
7594
with:
7695
python-version: ${{ matrix.python-version }}
@@ -84,4 +103,17 @@ jobs:
84103

85104
- name: Run tests for ${{ matrix.project }}
86105
run: uv run pytest -v -n auto
106+
=======
107+
uses: actions/setup-python@v2
108+
with:
109+
python-version: ${{ matrix.python-version }}
110+
111+
- name: Install hatch
112+
run: |
113+
python -m pip install --upgrade pip
114+
pip install hatch
115+
116+
- name: Run tests for ${{ matrix.project }}
117+
run: hatch test -v
118+
>>>>>>> 44fb982 (Add nats-server package)
87119
working-directory: ${{ matrix.project }}

0 commit comments

Comments
 (0)