Skip to content

Commit 2e179b5

Browse files
committed
CI: reset to CI from origin/develop
1 parent ccdcbed commit 2e179b5

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

.github/workflows/install-slips-dependencies.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ name: Install Slips Dependencies
33
on:
44
workflow_call:
55
inputs:
6+
zeek-repo-url:
7+
description: 'Zeek repository URL'
8+
required: false
9+
default: 'http://download.opensuse.org/repositories/security:/zeek/xUbuntu_22.04/'
10+
type: string
11+
zeek-key-url:
12+
description: 'Zeek key URL'
13+
required: false
14+
default: 'https://download.opensuse.org/repositories/security:zeek/xUbuntu_22.04/Release.key'
15+
type: string
616
python-version:
717
description: 'Python version to set up'
818
required: false
@@ -47,11 +57,9 @@ jobs:
4757

4858
- name: Install Zeek
4959
run: |
50-
sudo sed -i 's|http://download.opensuse.org|https://download.opensuse.org|' /etc/apt/sources.list.d/security:zeek.list
51-
sudo apt update || true
52-
sudo apt install -y --no-install-recommends --fix-missing zeek-8.0 || \
53-
(wget https://download.opensuse.org/repositories/security:/zeek/xUbuntu_22.04/all/zeek-8.0-btest-data_8.0.3-0_all.deb
54-
&& sudo dpkg -i zeek-8.0-btest-data_8.0.3-0_all.deb && sudo apt -f install)
60+
echo "deb ${{ inputs.zeek-repo-url }} /" | sudo tee /etc/apt/sources.list.d/security:zeek.list
61+
curl -fsSL ${{ inputs.zeek-key-url }} | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/security_zeek.gpg
62+
sudo apt update && sudo apt install -y --no-install-recommends zeek
5563
sudo ln -s /opt/zeek/bin/zeek /usr/local/bin/bro
5664
5765
- name: Mark dependencies as installed

.github/workflows/integration-tests.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,9 @@ jobs:
5858

5959
- name: Install Zeek
6060
run: |
61-
sudo sed -i 's|http://download.opensuse.org|https://download.opensuse.org|' /etc/apt/sources.list.d/security:zeek.list
62-
sudo apt update || true
63-
sudo apt install -y --no-install-recommends --fix-missing zeek-8.0 || \
64-
(wget https://download.opensuse.org/repositories/security:/zeek/xUbuntu_22.04/all/zeek-8.0-btest-data_8.0.3-0_all.deb
65-
&& sudo dpkg -i zeek-8.0-btest-data_8.0.3-0_all.deb && sudo apt -f install)
61+
sudo echo 'deb http://download.opensuse.org/repositories/security:/zeek/xUbuntu_22.04/ /' | sudo tee /etc/apt/sources.list.d/security:zeek.list
62+
curl -fsSL https://download.opensuse.org/repositories/security:zeek/xUbuntu_22.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/security_zeek.gpg > /dev/null
63+
sudo apt update && sudo apt install -y --no-install-recommends --fix-missing zeek
6664
sudo ln -s /opt/zeek/bin/zeek /usr/local/bin/bro
6765
6866

0 commit comments

Comments
 (0)