Update Github CI stuff.

michaelrsweet · Feb 11, 2024 · 2d7f39f · 2d7f39f
1 parent d592299
commit 2d7f39f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,40 +12,43 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: update build environment
+    - name: Checkout htmldoc sources
+      uses: actions/checkout@v4
+    - name: Update build environment
       run: sudo apt-get update --fix-missing -y
-    - name: install prerequisites
-      run: sudo apt-get install -y cppcheck libfltk1.3-dev libcups2-dev libgnutls28-dev libjpeg-dev libpng-dev zlib1g-dev
-    - name: configure
+    - name: Install prerequisites
+      run: sudo apt-get install -y cppcheck libfltk1.3-dev libcups2-dev libjpeg-dev libpng-dev zlib1g-dev
+    - name: Configure htmldoc
       env:
         CC: /usr/bin/gcc
       run: ./configure --enable-debug
-    - name: make
+    - name: Build htmldoc
       run: make
 
   build-macos:
 
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: install prerequisites
+    - name: Checkout htmldoc sources
+      uses: actions/checkout@v4
+    - name: Install prerequisites
       run: brew install cppcheck fltk libjpeg libpng
-    - name: configure
+    - name: Configure htmldoc
       run: ./configure --enable-debug --enable-maintainer --enable-sanitizer
-    - name: make
+    - name: Build htmldoc
       run: make
 
   build-windows:
 
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: setup-msbuild
-      uses: microsoft/[email protected]
-    - name: nuget restore
+    - name: Checkout htmldoc sources
+      uses: actions/checkout@v4
+    - name: Setup msbuild
+      uses: microsoft/setup-msbuild@v2
+    - name: Install prerequisites
       run: cd vcnet; nuget restore htmldoc.sln
-    - name: msbuild
+    - name: Build htmldoc
       run: cd vcnet; msbuild htmldoc.sln -t:htmldoc -t:ghtmldoc
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -30,7 +30,7 @@ jobs:
         run: sudo apt-get update --fix-missing -y
 
       - name: Install prerequisites
-        run: sudo apt-get install -y libfltk1.3-dev libcups2-dev libgnutls28-dev libjpeg-dev libpng-dev zlib1g-dev
+        run: sudo apt-get install -y libfltk1.3-dev libcups2-dev libjpeg-dev libpng-dev zlib1g-dev
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
@@ -7,11 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     environment: Coverity
     steps:
-      - uses: actions/checkout@v2
-      - name: update build environment
+      - name: Checkout htmldoc sources
+        uses: actions/checkout@v3
+      - name: Update build environment
         run: sudo apt-get update --fix-missing -y
-      - name: install prerequisites
-        run: sudo apt-get install -y libfltk1.3-dev libcups2-dev libgnutls28-dev libjpeg-dev libpng-dev zlib1g-dev
+      - name: Install prerequisites
+        run: sudo apt-get install -y libfltk1.3-dev libcups2-dev libjpeg-dev libpng-dev zlib1g-dev
       - name: Download Coverity Build Tool
         run: |
           wget -q https://scan.coverity.com/download/linux64 --post-data token="$TOKEN&project=$GITHUB_REPOSITORY" -O cov-analysis-linux64.tar.gz
@@ -20,10 +21,10 @@ jobs:
         env:
           TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
 
-      - name: configure
+      - name: Configure htmldoc
         run: ./configure --enable-debug --enable-maintainer
 
-      - name: Build with cov-build
+      - name: Build htmldoc with cov-build
         run: |
           export PATH=`pwd`/cov-analysis-linux64/bin:$PATH
           cov-build --dir cov-int make