diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 76e5ddb..bfb3b94 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -6,7 +6,7 @@ Description of current CI workflow. A series of QA checks run on the documentation. -The checks can be started manually from the ![workflow page](https://github.com/nesi/support-docs/actions/workflows/checks.yml/badge.svg), +The checks can be started manually from the ![workflow page](https://github.com/nesi/agdr/actions/workflows/checks.yml/badge.svg), select the target branch, give the pattern of files to include, and select which checks you want done. Checks will also be run on any _non main_ branch pushes. All checks will be run, but only on _changed_ files. diff --git a/.github/workflows/auto_merge.yml b/.github/workflows/auto_merge.yml index 057489f..9d2097c 100644 --- a/.github/workflows/auto_merge.yml +++ b/.github/workflows/auto_merge.yml @@ -5,6 +5,8 @@ on: - cron: '30 12 * * *' # Should run 30 min after get remote assets. env: GH_TOKEN: ${{ github.token }} + TARGET_REPO: agdr-docs + LABEL_NAME: auto_merge jobs: automerge: runs-on: ubuntu-latest @@ -13,7 +15,7 @@ jobs: with: fetch-depth: 0 - run: | - for branch in $(gh pr list -R nesi/support-docs --label "auto_merge" --json headRefName --jq .[].headRefName);do + for branch in $(gh pr list -R ${TARGET_REPO} --label "${LABEL_NAME}" --json headRefName --jq .[].headRefName);do git checkout $branch gh pr merge --squash --auto --delete-branch done diff --git a/.github/workflows/demo_deploy.yml b/.github/workflows/demo_deploy.yml index e4b77e5..2b1245e 100644 --- a/.github/workflows/demo_deploy.yml +++ b/.github/workflows/demo_deploy.yml @@ -6,10 +6,10 @@ # pull_request: # env: # GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# TARGET_REPO: "support-docs-dev" +# TARGET_REPO: "agdr-docs" # TARGET_OWNER: "CallumWalley" # WORKFLOW_ID: "deploy.yml" -# DEPLOY_URL: "https://callumwalley.github.io/support-docs-dev" +# DEPLOY_URL: "https://callumwalley.github.io/" # HEAD: ${{ github.event.pull_request.head.ref }} # permissions: write-all # jobs: diff --git a/.vscode/settings.json b/.vscode/settings.json index 908a38c..09c44e6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -39,7 +39,4 @@ "redhat.telemetry.enabled": false, "githubPullRequests.pushBranch": "always", "git.useEditorAsCommitInput": false, - "yaml.schemas": { - "https://json.schemastore.org/github-workflow.json": "file:///workspaces/support-docs/.github/workflows/deploy.yml" - } } diff --git a/README.md b/README.md index 5282398..d65a3ed 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ _One day I would like to simplify this whole thing._ A series of QA checks run on the documentation. -The checks can be started manually from the ![workflow page](https://github.com/nesi/support-docs/actions/workflows/checks.yml/badge.svg), +The checks can be started manually from the ![workflow page](https://github.com/nesi/agdr-docs/actions/workflows/checks.yml/badge.svg), select the target branch, give the pattern of files to include, and select which checks you want done. Checks will also be run on any _non main_ branch pushes. All checks will be run, but only on _changed_ files.