Skip to content

Commit 948bf16

Browse files
committed
ci: try using venv directly
Signed-off-by: Zakhar Bessarab <[email protected]>
1 parent 8f5cbe6 commit 948bf16

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ on:
66
# - master
77

88
jobs:
9-
lint:
9+
test:
1010
name: 'Test'
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: 'Checkout'
1414
uses: actions/checkout@v4
15-
#
16-
# - name: Cache .venv directory
17-
# uses: actions/cache@v4
18-
# with:
19-
# path: .venv
20-
# key: ${{ runner.os }}-venv-${{ hashFiles('**/requirements.txt') }}
15+
16+
- name: Cache .venv directory
17+
uses: actions/cache@v4
18+
with:
19+
path: .venv
20+
key: ${{ runner.os }}-venv-${{ hashFiles('**/requirements.txt') }}
2121

2222
- name: Converge
2323
run: |

Makefile

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,67 +13,67 @@ activate-venv:
1313
. .venv/bin/activate
1414

1515
molecule-converge-single:
16-
make activate-venv; \
16+
. .venv/bin/activate; \
1717
cd roles/single && molecule converge -s docker
1818

1919
molecule-converge-vmagent:
20-
make activate-venv; \
20+
. .venv/bin/activate; \
2121
cd roles/vmagent && molecule converge -s docker
2222

2323
molecule-converge-vmalert:
24-
make activate-venv; \
24+
. .venv/bin/activate; \
2525
cd roles/vmalert && molecule converge -s docker
2626

2727
molecule-converge-vminsert:
28-
make activate-venv; \
28+
. .venv/bin/activate; \
2929
cd roles/vminsert && molecule converge
3030

3131
molecule-converge-vmstorage:
32-
make activate-venv; \
32+
. .venv/bin/activate; \
3333
cd roles/vmstorage && molecule converge
3434

3535
molecule-converge-vmselect:
36-
make activate-venv; \
36+
. .venv/bin/activate; \
3737
cd roles/vmselect && molecule converge
3838

3939
molecule-converge-vmauth:
40-
make activate-venv; \
40+
. .venv/bin/activate; \
4141
cd roles/vmauth && molecule converge
4242

4343
molecule-converge-single-enterprise:
44-
make activate-venv; \
44+
. .venv/bin/activate; \
4545
cd roles/single && molecule converge -s docker-enterprise
4646

4747
molecule-converge-vmagent-enterprise:
48-
make activate-venv; \
48+
. .venv/bin/activate; \
4949
cd roles/vmagent && molecule converge -s docker-enterprise
5050

5151
molecule-converge-vmalert-enterprise:
52-
make activate-venv; \
52+
. .venv/bin/activate; \
5353
cd roles/vmalert && molecule converge -s docker-enterprise
5454

5555
molecule-converge-vminsert-enterprise:
56-
make activate-venv; \
56+
. .venv/bin/activate; \
5757
cd roles/vminsert && molecule converge -s enterprise
5858

5959
molecule-converge-vmstorage-enterprise:
60-
make activate-venv; \
60+
. .venv/bin/activate; \
6161
cd roles/vmstorage && molecule converge -s enterprise
6262

6363
molecule-converge-vmselect-enterprise:
64-
make activate-venv; \
64+
. .venv/bin/activate; \
6565
cd roles/vmselect && molecule converge -s enterprise
6666

6767
molecule-converge-vmauth-enterprise:
68-
make activate-venv; \
68+
. .venv/bin/activate; \
6969
cd roles/vmauth && molecule converge -s enterprise
7070

7171
molecule-converge-cluster-integration:
72-
make activate-venv; \
72+
. .venv/bin/activate; \
7373
cd playbooks/ && molecule converge -s cluster
7474

7575
molecule-converge-cluster-integration-enterprise:
76-
make activate-venv; \
76+
. .venv/bin/activate; \
7777
cd playbooks/ && molecule converge -s cluster-enterprise
7878

7979
molecule-converge: molecule-converge-single molecule-converge-vmagent molecule-converge-vmalert molecule-converge-vminsert molecule-converge-vmstorage molecule-converge-vmselect molecule-converge-vmauth
@@ -83,67 +83,67 @@ molecule-converge-enterprise: molecule-converge-single-enterprise molecule-conve
8383
molecule-converge-integration: molecule-converge-cluster-integration molecule-converge-cluster-integration-enterprise
8484

8585
molecule-destroy-single:
86-
make activate-venv; \
86+
. .venv/bin/activate; \
8787
cd roles/single && molecule destroy -s docker
8888

8989
molecule-destroy-vmagent:
90-
make activate-venv; \
90+
. .venv/bin/activate; \
9191
cd roles/vmagent && molecule destroy -s docker
9292

9393
molecule-destroy-vmalert:
94-
make activate-venv; \
94+
. .venv/bin/activate; \
9595
cd roles/vmalert && molecule destroy -s docker
9696

9797
molecule-destroy-vminsert:
98-
make activate-venv; \
98+
. .venv/bin/activate; \
9999
cd roles/vminsert && molecule destroy
100100

101101
molecule-destroy-vmstorage:
102-
make activate-venv; \
102+
. .venv/bin/activate; \
103103
cd roles/vmstorage && molecule destroy
104104

105105
molecule-destroy-vmselect:
106-
make activate-venv; \
106+
. .venv/bin/activate; \
107107
cd roles/vmselect && molecule destroy
108108

109109
molecule-destroy-vmauth:
110-
make activate-venv; \
110+
. .venv/bin/activate; \
111111
cd roles/vmauth && molecule destroy
112112

113113
molecule-destroy-single-enterprise:
114-
make activate-venv; \
114+
. .venv/bin/activate; \
115115
cd roles/single && molecule destroy -s docker-enterprise
116116

117117
molecule-destroy-vmagent-enterprise:
118-
make activate-venv; \
118+
. .venv/bin/activate; \
119119
cd roles/vmagent && molecule destroy -s docker-enterprise
120120

121121
molecule-destroy-vmalert-enterprise:
122-
make activate-venv; \
122+
. .venv/bin/activate; \
123123
cd roles/vmalert && molecule destroy -s docker-enterprise
124124

125125
molecule-destroy-vminsert-enterprise:
126-
make activate-venv; \
126+
. .venv/bin/activate; \
127127
cd roles/vminsert && molecule destroy -s enterprise
128128

129129
molecule-destroy-vmstorage-enterprise:
130-
make activate-venv; \
130+
. .venv/bin/activate; \
131131
cd roles/vmstorage && molecule destroy -s enterprise
132132

133133
molecule-destroy-vmselect-enterprise:
134-
make activate-venv; \
134+
. .venv/bin/activate; \
135135
cd roles/vmselect && molecule destroy -s enterprise
136136

137137
molecule-destroy-vmauth-enterprise:
138-
make activate-venv; \
138+
. .venv/bin/activate; \
139139
cd roles/vmauth && molecule destroy -s enterprise
140140

141141
molecule-destroy-cluster-integration:
142-
make activate-venv; \
142+
. .venv/bin/activate; \
143143
cd playbooks/ && molecule destroy -s cluster
144144

145145
molecule-destroy-cluster-integration-enterprise:
146-
make activate-venv; \
146+
. .venv/bin/activate; \
147147
cd playbooks/ && molecule destroy -s cluster-enterprise
148148

149149
molecule-destroy: molecule-destroy-single molecule-destroy-vmagent molecule-destroy-vmalert molecule-destroy-vminsert molecule-destroy-vmstorage molecule-destroy-vmselect molecule-destroy-vmauth molecule-destroy-cluster-integration

0 commit comments

Comments
 (0)