diff --git a/.github/workflows/website.yml b/.github/workflows/website-deploy.yml similarity index 86% rename from .github/workflows/website.yml rename to .github/workflows/website-deploy.yml index 08f018c45a..5724806f2e 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website-deploy.yml @@ -2,19 +2,17 @@ on: push: branches: - main - - develop paths: - 'docs/**' - - '.github/workflows/website.yml' + - '.github/workflows/website-deploy.yml' workflow_dispatch: branches: - main - - develop name: Build and Publish Website env: # the name of the repo HOME_REPO: usnistgov/OSCAL - HOME_BRANCH: develop + HOME_BRANCH: main # dependency versions HUGO_VERSION: 0.83.1 # build-specific environment @@ -75,9 +73,9 @@ jobs: # run: | # cd "${OSCAL_WEBSITE_PATH}" # bundle exec htmlproofer public/ --check-external-hash --url-swap "https\://pages.nist.gov/OSCAL/:/" --assume-extension --log-level :debug --url-ignore "\/reference\//,/pages.nist.gov\/(?:nist-header-footer|leaveNotice)\/.+/" -# - name: Run deploy script -# if: ${{ github.repository == env.HOME_REPO && github.ref == format('refs/heads/{0}',env.HOME_BRANCH) }} -# run: | -# cd "$OSCAL_WEBSITE_PATH" -# git config user.name "Deployment Bot" -# bash ./deploy.sh --push-only -v -m "Deploying website [ci deploy skip]" \ No newline at end of file + - name: Run deploy script + if: ${{ github.repository == env.HOME_REPO && github.ref == format('refs/heads/{0}',env.HOME_BRANCH) }} + run: | + cd "$OSCAL_WEBSITE_PATH" + git config user.name "Deployment Bot" + bash ./deploy.sh --push-only -v -m "Deploying website [ci deploy skip]" \ No newline at end of file diff --git a/versioning-and-branching.md b/versioning-and-branching.md index 9d94871c53..b614f35f1c 100644 --- a/versioning-and-branching.md +++ b/versioning-and-branching.md @@ -59,7 +59,7 @@ git push --set-upstream upstream release-1.2 Once the release is ready, the release can be made using the following Git commands: ``` -git checkout master +git checkout main git merge --no-ff release-1.2 git tag -a 1.2.0 git push --follow-tags @@ -72,7 +72,7 @@ Patch releases for a given MAJOR.MINOR version will be marked by annotated tags. Once a patch release is ready, the release can be made using the following Git commands: ``` -git checkout master +git checkout main git merge --no-ff release-1.2 git tag -a 1.2.1 git push --follow-tags