Skip to content

Commit edd34a0

Browse files
actypactyp
committed
Refine and update workflows to setup the virtual environment
1 parent 51f34a0 commit edd34a0

5 files changed

Lines changed: 107 additions & 87 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 91 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ jobs:
1111
- uses: actions/checkout@v6
1212
- uses: actions/setup-java@v5
1313
with:
14-
java-version: '21'
15-
distribution: 'temurin'
14+
java-version: "21"
15+
distribution: "temurin"
1616
- uses: ts-graphviz/setup-graphviz@v2
17-
- name: Install pydot
18-
run: pip3 install pydot
17+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
18+
19+
- name: Setup venv
20+
run: uv sync
1921

2022
- name: Setup EDHOC-Fuzzer
2123
run: ./scripts/setup_fuzzer.sh -l
@@ -41,11 +43,13 @@ jobs:
4143
- uses: actions/checkout@v6
4244
- uses: actions/setup-java@v5
4345
with:
44-
java-version: '21'
45-
distribution: 'temurin'
46+
java-version: "21"
47+
distribution: "temurin"
4648
- uses: ts-graphviz/setup-graphviz@v2
47-
- name: Install pydot
48-
run: pip3 install pydot
49+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
50+
51+
- name: Setup venv
52+
run: uv sync
4953

5054
- name: Setup EDHOC-Fuzzer
5155
run: ./scripts/setup_fuzzer.sh -l
@@ -71,11 +75,13 @@ jobs:
7175
- uses: actions/checkout@v6
7276
- uses: actions/setup-java@v5
7377
with:
74-
java-version: '21'
75-
distribution: 'temurin'
78+
java-version: "21"
79+
distribution: "temurin"
7680
- uses: ts-graphviz/setup-graphviz@v2
77-
- name: Install pydot
78-
run: pip3 install pydot
81+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
82+
83+
- name: Setup venv
84+
run: uv sync
7985

8086
- name: Setup EDHOC-Fuzzer
8187
run: ./scripts/setup_fuzzer.sh -l
@@ -97,11 +103,13 @@ jobs:
97103
- uses: actions/checkout@v6
98104
- uses: actions/setup-java@v5
99105
with:
100-
java-version: '21'
101-
distribution: 'temurin'
106+
java-version: "21"
107+
distribution: "temurin"
102108
- uses: ts-graphviz/setup-graphviz@v2
103-
- name: Install pydot
104-
run: pip3 install pydot
109+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
110+
111+
- name: Setup venv
112+
run: uv sync
105113

106114
- name: Setup EDHOC-Fuzzer
107115
run: ./scripts/setup_fuzzer.sh -l
@@ -114,57 +122,61 @@ jobs:
114122
java -jar edhoc-fuzzer.jar @experiments/args/rise/server_m4_app -roundLimit 5
115123
./scripts/diff_hyps.sh experiments/saved_results/servers/rise_m4_app experiments/results/servers/rise_m4_app 5
116124
117-
# SIFIS-HOME-Client:
118-
# if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
119-
# runs-on: ubuntu-latest
120-
# strategy:
121-
# fail-fast: true
122-
# steps:
123-
# - uses: actions/checkout@v6
124-
# - uses: actions/setup-java@v5
125-
# with:
126-
# java-version: '21'
127-
# distribution: 'temurin'
128-
# - uses: ts-graphviz/setup-graphviz@v2
129-
# - name: Install pydot
130-
# run: pip3 install pydot
131-
#
132-
# - name: Setup EDHOC-Fuzzer
133-
# run: ./scripts/setup_fuzzer.sh -l
134-
#
135-
# - name: Setup SIFIS-HOME
136-
# run: ./scripts/setup_sul.sh sifis-home
137-
#
138-
# - name: Test SIFIS-HOME Client (phase_1)
139-
# run: |
140-
# java -jar edhoc-fuzzer.jar @experiments/args/sifis-home/client_phase_1 -roundLimit 4
141-
# ./scripts/diff_hyps.sh experiments/saved_results/clients/sifis-home_phase_1 experiments/results/clients/sifis-home_phase_1 4
142-
#
143-
# SIFIS-HOME-Server:
144-
# if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
145-
# runs-on: ubuntu-latest
146-
# strategy:
147-
# fail-fast: true
148-
# steps:
149-
# - uses: actions/checkout@v6
150-
# - uses: actions/setup-java@v5
151-
# with:
152-
# java-version: '21'
153-
# distribution: 'temurin'
154-
# - uses: ts-graphviz/setup-graphviz@v2
155-
# - name: Install pydot
156-
# run: pip3 install pydot
157-
#
158-
# - name: Setup EDHOC-Fuzzer
159-
# run: ./scripts/setup_fuzzer.sh -l
160-
#
161-
# - name: Setup SIFIS-HOME
162-
# run: ./scripts/setup_sul.sh sifis-home
163-
#
164-
# - name: Test SIFIS-HOME Server (phase_1)
165-
# run: |
166-
# java -jar edhoc-fuzzer.jar @experiments/args/sifis-home/server_phase_1 -roundLimit 5
167-
# ./scripts/diff_hyps.sh experiments/saved_results/servers/sifis-home_phase_1 experiments/results/servers/sifis-home_phase_1 5
125+
# SIFIS-HOME-Client:
126+
# if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
127+
# runs-on: ubuntu-latest
128+
# strategy:
129+
# fail-fast: true
130+
# steps:
131+
# - uses: actions/checkout@v6
132+
# - uses: actions/setup-java@v5
133+
# with:
134+
# java-version: '21'
135+
# distribution: 'temurin'
136+
# - uses: ts-graphviz/setup-graphviz@v2
137+
# - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
138+
#
139+
# - name: Setup venv
140+
# run: uv sync
141+
#
142+
# - name: Setup EDHOC-Fuzzer
143+
# run: ./scripts/setup_fuzzer.sh -l
144+
#
145+
# - name: Setup SIFIS-HOME
146+
# run: ./scripts/setup_sul.sh sifis-home
147+
#
148+
# - name: Test SIFIS-HOME Client (phase_1)
149+
# run: |
150+
# java -jar edhoc-fuzzer.jar @experiments/args/sifis-home/client_phase_1 -roundLimit 4
151+
# ./scripts/diff_hyps.sh experiments/saved_results/clients/sifis-home_phase_1 experiments/results/clients/sifis-home_phase_1 4
152+
#
153+
# SIFIS-HOME-Server:
154+
# if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
155+
# runs-on: ubuntu-latest
156+
# strategy:
157+
# fail-fast: true
158+
# steps:
159+
# - uses: actions/checkout@v6
160+
# - uses: actions/setup-java@v5
161+
# with:
162+
# java-version: '21'
163+
# distribution: 'temurin'
164+
# - uses: ts-graphviz/setup-graphviz@v2
165+
# - uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
166+
#
167+
# - name: Setup venv
168+
# run: uv sync
169+
#
170+
# - name: Setup EDHOC-Fuzzer
171+
# run: ./scripts/setup_fuzzer.sh -l
172+
#
173+
# - name: Setup SIFIS-HOME
174+
# run: ./scripts/setup_sul.sh sifis-home
175+
#
176+
# - name: Test SIFIS-HOME Server (phase_1)
177+
# run: |
178+
# java -jar edhoc-fuzzer.jar @experiments/args/sifis-home/server_phase_1 -roundLimit 5
179+
# ./scripts/diff_hyps.sh experiments/saved_results/servers/sifis-home_phase_1 experiments/results/servers/sifis-home_phase_1 5
168180

169181
uOSCORE-uEDHOC-Client:
170182
if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
@@ -175,11 +187,13 @@ jobs:
175187
- uses: actions/checkout@v6
176188
- uses: actions/setup-java@v5
177189
with:
178-
java-version: '21'
179-
distribution: 'temurin'
190+
java-version: "21"
191+
distribution: "temurin"
180192
- uses: ts-graphviz/setup-graphviz@v2
181-
- name: Install pydot
182-
run: pip3 install pydot
193+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
194+
195+
- name: Setup venv
196+
run: uv sync
183197

184198
- name: Setup EDHOC-Fuzzer
185199
run: ./scripts/setup_fuzzer.sh -l
@@ -201,11 +215,13 @@ jobs:
201215
- uses: actions/checkout@v6
202216
- uses: actions/setup-java@v5
203217
with:
204-
java-version: '21'
205-
distribution: 'temurin'
218+
java-version: "21"
219+
distribution: "temurin"
206220
- uses: ts-graphviz/setup-graphviz@v2
207-
- name: Install pydot
208-
run: pip3 install pydot
221+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
222+
223+
- name: Setup venv
224+
run: uv sync
209225

210226
- name: Setup EDHOC-Fuzzer
211227
run: ./scripts/setup_fuzzer.sh -l

‎.github/workflows/codespell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ jobs:
88
- uses: codespell-project/actions-codespell@master
99
with:
1010
ignore_words_list: errorprone,keypair,keypairs
11-
skip: '*.patch,*.pdf'
11+
skip: "*.patch,*.pdf"

‎.github/workflows/concretization.yml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ jobs:
1111
- uses: actions/checkout@v6
1212
- uses: actions/setup-java@v5
1313
with:
14-
java-version: '21'
15-
distribution: 'temurin'
14+
java-version: "21"
15+
distribution: "temurin"
1616
- uses: ts-graphviz/setup-graphviz@v2
17-
- name: Install pydot
18-
run: pip3 install pydot
17+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
18+
19+
- name: Setup venv
20+
run: uv sync
1921

2022
- name: Setup EDHOC-Fuzzer
2123
run: ./scripts/setup_fuzzer.sh -l
@@ -42,11 +44,13 @@ jobs:
4244
- uses: actions/checkout@v6
4345
- uses: actions/setup-java@v5
4446
with:
45-
java-version: '21'
46-
distribution: 'temurin'
47+
java-version: "21"
48+
distribution: "temurin"
4749
- uses: ts-graphviz/setup-graphviz@v2
48-
- name: Install pydot
49-
run: pip3 install pydot
50+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
51+
52+
- name: Setup venv
53+
run: uv sync
5054

5155
- name: Setup EDHOC-Fuzzer
5256
run: ./scripts/setup_fuzzer.sh -l

‎.github/workflows/shellcheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ jobs:
77
- uses: actions/checkout@v6
88
- uses: ludeeus/action-shellcheck@master
99
with:
10-
scandir: './scripts'
10+
scandir: "./scripts"

‎.github/workflows/spotless.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- name: Set up JDK 21
1010
uses: actions/setup-java@v5
1111
with:
12-
java-version: '21'
13-
distribution: 'temurin'
12+
java-version: "21"
13+
distribution: "temurin"
1414
- name: spotlessCheck
1515
run: mvn spotless:check

0 commit comments

Comments
 (0)