General updates (#42)

brimdata · Dec 28, 2023 · 6ce6b26 · 6ce6b26
1 parent 6c1ca2f
commit 6ce6b26
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/smoketest.yml b/.github/workflows/smoketest.yml
@@ -4,14 +4,15 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
+  workflow_dispatch:
 
 jobs:
   smoketest:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04]
+        os: [ubuntu-20.04]
     env:
         PULL_REQUEST_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
     steps:

diff --git a/.github/workflows/update-geolite2.yml b/.github/workflows/update-geolite2.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   update-db:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v3
       with:
@@ -23,7 +23,7 @@ jobs:
         MONTH=${DATESTR:4:2}
         DAY=${DATESTR:6:2}
         DATESTAMP="${YEAR}-${MONTH}-${DAY}"
-        echo "##[set-output name=datestmp;]$(echo ${DATESTAMP})"
+        echo "name=$(echo ${DATESTAMP})" >> $GITHUB_OUTPUT
       id: extract_datestamp
     - name: Create Pull Request containing updated GeoLite2 database
       uses: peter-evans/create-pull-request@v3

diff --git a/smoketest.sh b/smoketest.sh
@@ -12,10 +12,10 @@ fi
 
 # Install the latest binary feature release build of Zeek per instructions at
 # https://software.opensuse.org//download.html?project=security%3Azeek&package=zeek
-echo 'deb http://download.opensuse.org/repositories/security:/zeek/xUbuntu_18.04/ /' | sudo tee /etc/apt/sources.list.d/security:zeek.list
-curl -fsSL https://download.opensuse.org/repositories/security:zeek/xUbuntu_18.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/security:zeek.gpg > /dev/null
-sudo apt update
-sudo apt -y install zeek python3-setuptools
+echo 'deb http://download.opensuse.org/repositories/security:/zeek/xUbuntu_20.04/ /' | sudo tee /etc/apt/sources.list.d/security:zeek.list
+curl -fsSL https://download.opensuse.org/repositories/security:zeek/xUbuntu_20.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/security_zeek.gpg > /dev/null
+sudo apt-get update
+sudo apt-get -y install zeek python3-setuptools
 
 # Add Zeek Package Manager and current revision of the geoip-conn package
 pip3 install zkg wheel