From d6500f5870d561efc76c9d5f9de272bbdb7238bc Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Mon, 3 May 2021 10:34:31 -0700
Subject: [PATCH] GitLab CI: Publish the API reference.

Build the wsar_html_zip instead of wsar_html and (re-)publish it at
https://www.wireshark.org/download/docs/. Move the doxygen_all job to
the daily schedule section.
---
 .gitlab-ci.yml | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd962071e8..d7079a7d1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -323,28 +323,6 @@ docbook:
   needs: []
 
 
-# Build all doxygen docs
-doxygen_all:
-  image: wireshark/wireshark-ubuntu-dev
-  rules: !reference [.if-daily-schedule]
-  stage: build
-  script:
-    - mkdir build
-    - cd build
-    - cmake -GNinja ..
-    - ninja wsar_html 2>&1 > doxygen_output.txt | tee doxygen_errors.txt
-  after_script:
-    - mv build/wsar_html .
-    - mv build/doxygen_output.txt .
-    - mv build/doxygen_errors.txt .
-  artifacts:
-    when: always
-    paths:
-    - doxygen_errors.txt
-    - doxygen_output.txt
-    - wsar_html
-  needs: []
-
 # https://docs.gitlab.com/ee/user/gitlab_com/index.html#linux-shared-runners
 
 merge-req:commit-checks:
@@ -556,6 +534,29 @@ build:windows-vs-code-analysis:
     - cmake -DENABLE_CODE_ANALYSIS=ON -G "Visual Studio 16 2019" -A x64 -DENABLE_LTO=off ..
     - msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount:2 Wireshark.sln
 
+# Build all doxygen docs
+doxygen_all:
+  image: wireshark/wireshark-ubuntu-dev
+  rules: !reference [.if-daily-schedule]
+  stage: build
+  script:
+    - mkdir build
+    - cd build
+    - cmake -GNinja ..
+    - ninja wsar_html_zip 2>&1 > doxygen_output.txt | tee doxygen_errors.txt
+  after_script:
+    - mv build/wsar_html_zip .
+    - mv build/doxygen_output.txt .
+    - mv build/doxygen_errors.txt .
+    - if [ -n "$AWS_ACCESS_KEY_ID" ] && [ -n "$AWS_SECRET_ACCESS_KEY" ] && [ -n "$S3_DESTINATION_DIST" ] ; then aws s3 cp wsar_html_zip "$S3_DESTINATION_DIST/" ; fi
+  artifacts:
+    when: always
+    paths:
+    - doxygen_errors.txt
+    - doxygen_output.txt
+    - wsar_html.zip
+  needs: []
+
 sloccount:
   extends: .build-ubuntu
   rules: !reference [.if-daily-schedule]