From 0741a503da733cefd93afc6f330166ba33e70ea9 Mon Sep 17 00:00:00 2001 From: jhudsl-robot Date: Fri, 27 Jun 2025 15:37:10 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=84=20Synced=20local=20'.github/wo?= =?UTF-8?q?rkflows/'=20with=20remote=20'.github/workflows/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit test-run --- .github/workflows/check-url.yml | 87 +++++++++++++++----------------- .github/workflows/render-all.yml | 2 +- 2 files changed, 42 insertions(+), 47 deletions(-) diff --git a/.github/workflows/check-url.yml b/.github/workflows/check-url.yml index 7c1326c..7b45670 100644 --- a/.github/workflows/check-url.yml +++ b/.github/workflows/check-url.yml @@ -22,24 +22,46 @@ jobs: files: config_automation.yml # Pass a space-separated list of configuration files. Rightmost files take precedence. outputs: toggle_url_check_periodically: "${{ env.URL_CHECK_PERIODICALLY }}" + url_error_min: "${{ env.URL_ERROR_MIN }}" url-check: name: Check URLs needs: set-up if: ${{needs.set-up.outputs.toggle_url_check_periodically == 'true'}} runs-on: ubuntu-latest - container: - image: jhudsl/base_ottr:main + outputs: + status: ${{ steps.check_results.outcome }} + + steps: + - name: Run the check + uses: ottrproject/ottr-reports@main + id: check_results + continue-on-error: true + with: + check_spelling: false + spelling_error_min: 1 + check_urls: true + url_error_min: ${{needs.set-up.outputs.url_error_min}} + check_quiz_form: false + quiz_error_min: 1 + sort_dictionary: false + + issue-maker: + name: Create issue + needs: url-check + if: needs.url-check.outputs.status == 'failure' # Proceed to make an issue if the checker above failed anywhere + runs-on: ubuntu-latest steps: + - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - + # Delete the branch if this has been run before - name: Delete branch locally and remotely - run: git push origin --delete preview-spell-error || echo "No branch to delete" + run: git push origin --delete periodic-url-error || echo "No branch to delete" # Make the branch fresh - name: Make the branch fresh @@ -49,59 +71,38 @@ jobs: git config --global user.email 'github-actions[bot]@users.noreply.github.com' echo branch doesnt exist - git checkout -b preview-spell-error || echo branch exists - git push --set-upstream origin preview-spell-error || echo echo branch exists remotely + git checkout -b periodic-url-error || echo branch exists + git push --set-upstream origin periodic-url-error || echo echo branch exists remotely shell: bash - - - name: Run the check - uses: ottrproject/ottr-reports@main - id: check_results - continue-on-error: true + + - name: Download artifact + uses: actions/download-artifact@v4 with: - check_type: urls - error_min: 1 - + name: ottr-check-reports + - name: Declare file path and time id: check-report run: | - error_num=$(cat check_reports/url_checks.tsv | wc -l) + error_num=$(cat url_checks.tsv | wc -l) error_num="$((error_num-1))" echo "error_num=$error_num" >> $GITHUB_OUTPUT - echo "error_url=https://github.com/${GITHUB_REPOSITORY}/blob/preview-spell-error/check_reports/url_checks.tsv" >> $GITHUB_OUTPUT + echo "error_url=https://github.com/${GITHUB_REPOSITORY}/blob/periodic-url-error/url_checks.tsv" >> $GITHUB_OUTPUT shell: bash - - name: Stop if failure - if: steps.check_results.outcome == 'failure' - run: exit 1 - - name: Print out error variables run: | echo ${{ steps.check-report.outputs.error_url }} echo ${{ steps.check-report.outputs.error_num }} - # Commit file - - name: Commit spell check file - if: ${{ steps.check-report.outputs.error_num >= 1 }} + - name: Commit URL errors file env: GH_PAT: ${{ secrets.GH_PAT }} run: | - git add --force check_reports/url_checks.tsv - git commit -m 'Add spell check file' || echo "No changes to commit" - git push --set-upstream origin preview-spell-error || echo echo branch exists remotely + git add --force url_checks.tsv + git commit -m 'Add URL check file' || echo "No changes to commit" + git push --set-upstream origin periodic-url-error || echo echo branch exists remotely - - name: Find issues - id: find-issue - env: - GH_PAT: ${{ secrets.GH_PAT }} - run: | - echo "$GITHUB_REPOSITORY" - curl -o find_issue.R https://raw.githubusercontent.com/ottrproject/ottr-reports/main/scripts/find_issue.R - issue_exists=$(Rscript --vanilla find_issue.R --repo $GITHUB_REPOSITORY --git_pat $GH_PAT) - echo URL issue exists: $issue_exists - echo "issue_existence=$issue_exists" >> $GITHUB_OUTPUT - - - name: If too many URL errors, then make an issue - if: ${{ steps.check-report.outputs.error_num >= 1 && steps.find-issue.outputs.issue_existence == 0}} + - name: Make the issue uses: JasonEtco/create-an-issue@v2 with: filename: .github/ISSUE_TEMPLATE/url-error.md @@ -109,9 +110,3 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} FILE_URL: ${{ steps.check-report.outputs.error_url }} ERROR_NUM: ${{ steps.check-report.outputs.error_num }} - - - name: If no URL errors than delete the branch we made - if: ${{ steps.check-report.outputs.error_num < 1 }} - run: | - git config --system --add safe.directory "$GITHUB_WORKSPACE" - git push origin --delete preview-spell-error || echo "No branch to delete" diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml index 344b523..6b5937d 100644 --- a/.github/workflows/render-all.yml +++ b/.github/workflows/render-all.yml @@ -42,7 +42,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.GH_PAT }} - + - name: Run render id: render uses: ottrproject/ottr-preview@main From d33648b6bb89bbf0dc3494760f80b365b33799ab Mon Sep 17 00:00:00 2001 From: jhudsl-robot Date: Fri, 27 Jun 2025 15:37:10 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=94=84=20Created=20local=20'.github/w?= =?UTF-8?q?orkflows/render-site.yml'=20from=20remote=20'.github/workflows/?= =?UTF-8?q?render-all.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit test-run --- .github/workflows/render-site.yml | 53 +++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .github/workflows/render-site.yml diff --git a/.github/workflows/render-site.yml b/.github/workflows/render-site.yml new file mode 100644 index 0000000..6b5937d --- /dev/null +++ b/.github/workflows/render-site.yml @@ -0,0 +1,53 @@ +# Candace Savonen 2021 +# Updated April 2025 + +name: Render website + +on: + workflow_dispatch: + push: + branches: [ main, staging ] + paths: + - '*.qmd' + - '*.Rmd' + - assets/* + - quizzes/* + +jobs: + + yaml-check: + name: Load user automation choices + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + # Use the yaml-env-action action. + - name: Load environment from YAML + uses: doughepi/yaml-env-action@v1.0.0 + with: + files: config_automation.yml # Pass a space-separated list of configuration files. Rightmost files take precedence. + outputs: + toggle_website: "${{ env.RENDER_WEBSITE }}" + rendering_docker_image: "${{ env.RENDERING_DOCKER_IMAGE }}" + + render-website: + name: Render website + needs: yaml-check + runs-on: ubuntu-latest + + steps: + - name: checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GH_PAT }} + + - name: Run render + id: render + uses: ottrproject/ottr-preview@main + with: + toggle_website: ${{needs.yaml-check.outputs.toggle_website}} + preview: false + token: ${{ secrets.GH_PAT }} + docker_image: ${{needs.yaml-check.outputs.rendering_docker_image}} From a30e6e50a72ad7fde77679a52e9f50327aed952d Mon Sep 17 00:00:00 2001 From: avahoffman Date: Fri, 27 Jun 2025 11:57:22 -0400 Subject: [PATCH 3/3] Delete render-all.yml --- .github/workflows/render-all.yml | 53 -------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 .github/workflows/render-all.yml diff --git a/.github/workflows/render-all.yml b/.github/workflows/render-all.yml deleted file mode 100644 index 6b5937d..0000000 --- a/.github/workflows/render-all.yml +++ /dev/null @@ -1,53 +0,0 @@ -# Candace Savonen 2021 -# Updated April 2025 - -name: Render website - -on: - workflow_dispatch: - push: - branches: [ main, staging ] - paths: - - '*.qmd' - - '*.Rmd' - - assets/* - - quizzes/* - -jobs: - - yaml-check: - name: Load user automation choices - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - # Use the yaml-env-action action. - - name: Load environment from YAML - uses: doughepi/yaml-env-action@v1.0.0 - with: - files: config_automation.yml # Pass a space-separated list of configuration files. Rightmost files take precedence. - outputs: - toggle_website: "${{ env.RENDER_WEBSITE }}" - rendering_docker_image: "${{ env.RENDERING_DOCKER_IMAGE }}" - - render-website: - name: Render website - needs: yaml-check - runs-on: ubuntu-latest - - steps: - - name: checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - token: ${{ secrets.GH_PAT }} - - - name: Run render - id: render - uses: ottrproject/ottr-preview@main - with: - toggle_website: ${{needs.yaml-check.outputs.toggle_website}} - preview: false - token: ${{ secrets.GH_PAT }} - docker_image: ${{needs.yaml-check.outputs.rendering_docker_image}}