diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4dbff16643..2ef325edf2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,12 +6,6 @@ updates: interval: 'daily' time: '02:00' target-branch: 'main' - - package-ecosystem: 'npm' - directory: '/' - target-branch: 'master' - schedule: - interval: 'daily' - time: '01:00' - package-ecosystem: 'github-actions' directory: '/' schedule: diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 8037d7caaf..06c93436bd 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -1,29 +1,29 @@ name: Build and Deploy Docs on: - push: - branches: - - master + push: + branches: + - main jobs: - build-and-deploy-docs: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.2.2 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: '20' - # Pre-check to validate that versions match between package.json - # and package-lock.json. Needs to run before npm install - - name: Validate package.json and package-lock.json versions - run: node version-check.js - - name: Install dependencies - run: npm ci - - name: Build docs - run: npm run docs + build-and-deploy-docs: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4.2.2 + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + # Pre-check to validate that versions match between package.json + # and package-lock.json. Needs to run before npm install + - name: Validate package.json and package-lock.json versions + run: node version-check.js + - name: Install dependencies + run: npm ci + - name: Build docs + run: npm run docs - - name: Deploy docs - uses: JamesIves/github-pages-deploy-action@v4.7.3 - with: - branch: gh-pages # The branch the action should deploy to. - folder: docs # The folder the action should deploy. + - name: Deploy docs + uses: JamesIves/github-pages-deploy-action@v4.7.3 + with: + branch: gh-pages # The branch the action should deploy to. + folder: docs # The folder the action should deploy. diff --git a/pre-check.sh b/pre-check.sh index 5ad811e98e..18b05d8120 100644 --- a/pre-check.sh +++ b/pre-check.sh @@ -8,7 +8,7 @@ if [[ "${branch}" != "main" ]]; then fi if ! git diff --quiet; then - echo "This script must only run on a clean master branch." + echo "This script must only run on a clean main branch." echo git status exit 1