From 39126ca6e22c24d87cbdf81e028c81d26288546e Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 18 Jul 2024 12:58:58 -0600 Subject: [PATCH 1/6] testing --- .github/workflows/docs.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 03759b69..ecee0b49 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,6 +7,9 @@ on: push: branches: - develop + pull_request: + branches: + - develop # Cancel in-progress workflows when pushing to a branch concurrency: @@ -95,7 +98,7 @@ jobs: make VERBOSE=1 - name: Upload built documentation - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3.1 with: path: wgrib2/build/docs/html # Path to the built site files From bb280fd53d27456aa3febdb2bf809a77e0fbaa6a Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 18 Jul 2024 13:04:31 -0600 Subject: [PATCH 2/6] testing --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ecee0b49..17100a0c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -98,7 +98,7 @@ jobs: make VERBOSE=1 - name: Upload built documentation - uses: actions/upload-pages-artifact@v3.1 + uses: actions/upload-pages-artifact@v3 with: path: wgrib2/build/docs/html # Path to the built site files From 85029df7681f1b4fd7a299184a84edee42f18a1e Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 18 Jul 2024 13:25:51 -0600 Subject: [PATCH 3/6] testing --- .github/workflows/docs.yml | 40 +++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 17100a0c..70f402dc 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -17,7 +17,7 @@ concurrency: cancel-in-progress: true jobs: - docs: + build-docs: runs-on: ubuntu-latest env: FC: gfortran @@ -33,7 +33,7 @@ jobs: run: | sudo apt-get update sudo apt-get install libnetcdf-dev libnetcdff-dev netcdf-bin pkg-config - sudo apt-get install libpng-dev autotools-dev libaec-dev autoconf gcovr doxygen + sudo apt-get install libpng-dev libaec-dev doxygen - name: cache-jasper id: cache-jasper @@ -86,9 +86,6 @@ jobs: path: ~/data key: data-2 - - name: Setup Pages - uses: actions/configure-pages@v4 - - name: build run: | cd wgrib2 @@ -96,13 +93,34 @@ jobs: cd build cmake .. -DENABLE_DOCS=ON -DCMAKE_PREFIX_PATH="~/ip" make VERBOSE=1 - - - name: Upload built documentation - uses: actions/upload-pages-artifact@v3 + + - name: upload + - uses: actions/upload-artifact@master with: - path: wgrib2/build/docs/html # Path to the built site files + name: page + path: | + wgrib2/build/*.html + wgrib2/build/*.css + if-no-files-found: error + + deploy-docs: + runs-on: ubuntu-latest + needs: build-docs + environment: + name: github-pages + url: ${{steps.deployment.outputs.page_url}} + + steps: + - uses: actions/download-artifact@master + with: + name: page + path: . + - uses: actions/configure-pages@v1 + - uses: actions/upload-pages-artifact@v1 + with: + path: . + - id: deployment + uses: actions/deploy-pages@main - - name: Deploy - uses: actions/deploy-pages@v1 From 57ceb7f94e438fad881ffa8ba452a49c3ceeb452 Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 18 Jul 2024 13:27:44 -0600 Subject: [PATCH 4/6] testing --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 70f402dc..b60e505b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -95,7 +95,7 @@ jobs: make VERBOSE=1 - name: upload - - uses: actions/upload-artifact@master + uses: actions/upload-artifact@master with: name: page path: | From 794d016133249bb6810d8fd20db6d25f85066358 Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 18 Jul 2024 13:35:14 -0600 Subject: [PATCH 5/6] testing --- .github/workflows/docs.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b60e505b..17176849 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -98,9 +98,7 @@ jobs: uses: actions/upload-artifact@master with: name: page - path: | - wgrib2/build/*.html - wgrib2/build/*.css + path: wgrib2/build/docs/html if-no-files-found: error deploy-docs: From 7e74da98d8f276435d6b6d7d9cc58ed90a0e9d42 Mon Sep 17 00:00:00 2001 From: Ed Date: Thu, 18 Jul 2024 13:39:30 -0600 Subject: [PATCH 6/6] testing --- .github/workflows/docs.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 17176849..5283f823 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -7,9 +7,6 @@ on: push: branches: - develop - pull_request: - branches: - - develop # Cancel in-progress workflows when pushing to a branch concurrency: