aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorPatrick H. Lauke <[email protected]>2021-05-04 12:46:06 +0100
committerGitHub <[email protected]>2021-05-04 12:46:06 +0100
commit8865a8ab1c7157ab81bf49afa62b75f36daee46d (patch)
tree97ef78f2ea8e07aab50014176d061fe3c1d49134 /.github
parent018ee6a3b50b958ddb49657086cd9168abf5a485 (diff)
parent7ea6578773cb1b7f5cfb8fb41321b3fa10349daf (diff)
downloadbootstrap-jo-docs-thanks-page.tar.xz
bootstrap-jo-docs-thanks-page.zip
Merge branch 'main' into jo-docs-thanks-pagejo-docs-thanks-page
Diffstat (limited to '.github')
-rw-r--r--.github/CONTRIBUTING.md18
-rw-r--r--.github/dependabot.yml7
-rw-r--r--.github/release-drafter.yml14
-rw-r--r--.github/workflows/browserstack.yml11
-rw-r--r--.github/workflows/bundlewatch.yml12
-rw-r--r--.github/workflows/codeql.yml10
-rw-r--r--.github/workflows/css.yml10
-rw-r--r--.github/workflows/docs.yml10
-rw-r--r--.github/workflows/js.yml12
-rw-r--r--.github/workflows/lint.yml10
-rw-r--r--.github/workflows/node-sass.yml5
-rw-r--r--.github/workflows/release-notes.yml1
12 files changed, 60 insertions, 60 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 0913b5b5b..32b30cdb3 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -101,12 +101,12 @@ Example:
Sometimes bugs reported to us are actually caused by bugs in the browser(s) themselves, not bugs in Bootstrap per se.
-| Vendor(s) | Browser(s) | Rendering engine | Bug reporting website(s) | Notes |
-| ------------- | ---------------------------- | ---------------- | --------------------------------------------------------------------- | -------------------------------------------------------- |
-| Mozilla | Firefox | Gecko | https://bugzilla.mozilla.org/enter_bug.cgi | "Core" is normally the right product option to choose. |
-| Apple | Safari | WebKit | https://bugs.webkit.org/enter_bug.cgi?product=WebKit | In Apple's bug reporter, choose "Safari" as the product. |
-| Google, Opera | Chrome, Chromium, Opera v15+ | Blink | https://bugs.chromium.org/p/chromium/issues/list | Click the "New issue" button. |
-| Microsoft | Edge | Blink | https://developer.microsoft.com/en-us/microsoft-edge/ | Go to "Help > Send Feedback" from the browser |
+| Vendor(s) | Browser(s) | Rendering engine | Bug reporting website(s) | Notes |
+| ------------- | ---------------------------- | ---------------- | ------------------------------------------------------ | -------------------------------------------------------- |
+| Mozilla | Firefox | Gecko | https://bugzilla.mozilla.org/enter_bug.cgi | "Core" is normally the right product option to choose. |
+| Apple | Safari | WebKit | https://bugs.webkit.org/enter_bug.cgi?product=WebKit | In Apple's bug reporter, choose "Safari" as the product. |
+| Google, Opera | Chrome, Chromium, Opera v15+ | Blink | https://bugs.chromium.org/p/chromium/issues/list | Click the "New issue" button. |
+| Microsoft | Edge | Blink | https://developer.microsoft.com/en-us/microsoft-edge/ | Go to "Help > Send Feedback" from the browser |
## Feature requests
@@ -134,9 +134,9 @@ Please adhere to the [coding guidelines](#code-guidelines) used throughout the
project (indentation, accurate comments, etc.) and any other requirements
(such as test coverage).
-**Do not edit `bootstrap.css`, or `bootstrap.js`
-directly!** Those files are automatically generated. You should edit the
-source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/main/scss)
+**Do not edit `bootstrap.css` or `bootstrap.js`, and do not commit
+any dist files (`dist/` or `js/dist`).** Those files are automatically generated by our build tools. You should
+edit the source files in [`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/main/scss)
and/or [`/bootstrap/js/src/`](https://github.com/twbs/bootstrap/tree/main/js/src) instead.
Similarly, when contributing to Bootstrap's documentation, you should edit the
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 31976021e..29135b400 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -15,3 +15,10 @@ updates:
- v5
versioning-strategy: increase
rebase-strategy: disabled
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: weekly
+ day: tuesday
+ time: "12:00"
+ timezone: Europe/Athens
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index ae1367c89..e2b70e03e 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -4,6 +4,9 @@ prerelease: true
exclude-labels:
- 'skip-changelog'
categories:
+ - title: '❗ Breaking Changes'
+ labels:
+ - 'breaking-change'
- title: '🚀 Features'
labels:
- 'new-feature'
@@ -14,6 +17,9 @@ categories:
- 'fix'
- 'bugfix'
- 'bug'
+ - title: '⚡ Performance Improvements'
+ labels:
+ - 'performance'
- title: '🎨 CSS'
labels:
- 'css'
@@ -26,11 +32,19 @@ categories:
- title: '🌎 Accessibility'
labels:
- 'accessibility'
+ - title: '🔧 Utility API'
+ labels:
+ - 'utility API'
+ - 'utilities'
+ - title: '🏭 Tests'
+ labels:
+ - 'tests'
- title: '🧰 Misc'
labels:
- 'build'
- 'meta'
- 'chore'
+ - 'CI'
- title: '📦 Dependencies'
labels:
- 'dependencies'
diff --git a/.github/workflows/browserstack.yml b/.github/workflows/browserstack.yml
index 0b4cfbdaa..bdbc16089 100644
--- a/.github/workflows/browserstack.yml
+++ b/.github/workflows/browserstack.yml
@@ -4,21 +4,21 @@ on:
push:
env:
- CI: true
FORCE_COLOR: 2
- NODE: 14.x
+ NODE: 14
jobs:
browserstack:
runs-on: ubuntu-latest
if: github.repository == 'twbs/bootstrap' && (!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]'))
+ timeout-minutes: 30
steps:
- name: Clone repository
uses: actions/checkout@v2
- name: Set up Node.js
- uses: actions/setup-node@v1
+ uses: actions/setup-node@v2
with:
node-version: "${{ env.NODE }}"
@@ -26,10 +26,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.npm
- key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+ key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
- ${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- ${{ runner.OS }}-node-v${{ env.NODE }}-
+ ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- name: Install npm dependencies
run: npm ci
diff --git a/.github/workflows/bundlewatch.yml b/.github/workflows/bundlewatch.yml
index 966dfbf72..b2b1fa109 100644
--- a/.github/workflows/bundlewatch.yml
+++ b/.github/workflows/bundlewatch.yml
@@ -2,14 +2,11 @@ name: Bundlewatch
on:
push:
- branches-ignore:
- - "dependabot/**"
pull_request:
env:
- CI: true
FORCE_COLOR: 2
- NODE: 14.x
+ NODE: 14
jobs:
bundlewatch:
@@ -20,7 +17,7 @@ jobs:
uses: actions/checkout@v2
- name: Set up Node.js
- uses: actions/setup-node@v1
+ uses: actions/setup-node@v2
with:
node-version: "${{ env.NODE }}"
@@ -28,10 +25,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.npm
- key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+ key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
- ${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- ${{ runner.OS }}-node-v${{ env.NODE }}-
+ ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- name: Install npm dependencies
run: npm ci
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f9dccfce0..13e2eb598 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -11,6 +11,7 @@ on:
branches:
- main
- v4-dev
+ - "!dependabot/**"
schedule:
- cron: "0 2 * * 5"
@@ -22,15 +23,6 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
- with:
- # We must fetch at least the immediate parents so that if this is
- # a pull request then we can checkout the head.
- fetch-depth: 2
-
- # If this run was triggered by a pull request event, then checkout
- # the head of the pull request instead of the merge commit.
- - run: git checkout HEAD^2
- if: ${{ github.event_name == 'pull_request' }}
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
diff --git a/.github/workflows/css.yml b/.github/workflows/css.yml
index a75f018c5..1f394c65e 100644
--- a/.github/workflows/css.yml
+++ b/.github/workflows/css.yml
@@ -7,9 +7,8 @@ on:
pull_request:
env:
- CI: true
FORCE_COLOR: 2
- NODE: 14.x
+ NODE: 14
jobs:
css:
@@ -20,7 +19,7 @@ jobs:
uses: actions/checkout@v2
- name: Set up Node.js
- uses: actions/setup-node@v1
+ uses: actions/setup-node@v2
with:
node-version: "${{ env.NODE }}"
@@ -28,10 +27,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.npm
- key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+ key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
- ${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- ${{ runner.OS }}-node-v${{ env.NODE }}-
+ ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- name: Install npm dependencies
run: npm ci
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 58b55fc7c..badaad744 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -7,9 +7,8 @@ on:
pull_request:
env:
- CI: true
FORCE_COLOR: 2
- NODE: 14.x
+ NODE: 14
jobs:
docs:
@@ -20,7 +19,7 @@ jobs:
uses: actions/checkout@v2
- name: Set up Node.js
- uses: actions/setup-node@v1
+ uses: actions/setup-node@v2
with:
node-version: "${{ env.NODE }}"
@@ -30,10 +29,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.npm
- key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+ key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
- ${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- ${{ runner.OS }}-node-v${{ env.NODE }}-
+ ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- name: Install npm dependencies
run: npm ci
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index 1ec0d6909..9a2d92f94 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -7,7 +7,6 @@ on:
pull_request:
env:
- CI: true
FORCE_COLOR: 2
jobs:
@@ -18,14 +17,14 @@ jobs:
strategy:
fail-fast: false
matrix:
- node: [10, 12, 14]
+ node: [10, 12, 14, 16]
steps:
- name: Clone repository
uses: actions/checkout@v2
- name: Set up Node.js
- uses: actions/setup-node@v1
+ uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
@@ -33,10 +32,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.npm
- key: ${{ runner.os }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}}
+ key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
- ${{ runner.OS }}-node-v${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- ${{ runner.OS }}-node-v${{ matrix.node }}-
+ ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- name: Install npm dependencies
run: npm ci
@@ -48,7 +46,7 @@ jobs:
run: npm run js-test
- name: Run Coveralls
- uses: coverallsapp/github-action@master
+ uses: coverallsapp/[email protected]
if: matrix.node == 14
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e850a1f1b..f4c288ec7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -7,9 +7,8 @@ on:
pull_request:
env:
- CI: true
FORCE_COLOR: 2
- NODE: 14.x
+ NODE: 14
jobs:
lint:
@@ -20,7 +19,7 @@ jobs:
uses: actions/checkout@v2
- name: Set up Node.js
- uses: actions/setup-node@v1
+ uses: actions/setup-node@v2
with:
node-version: "${{ env.NODE }}"
@@ -28,10 +27,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.npm
- key: ${{ runner.os }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
+ key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
- ${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- ${{ runner.OS }}-node-v${{ env.NODE }}-
+ ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- name: Install npm dependencies
run: npm ci
diff --git a/.github/workflows/node-sass.yml b/.github/workflows/node-sass.yml
index 2db55f0ff..ee64b2152 100644
--- a/.github/workflows/node-sass.yml
+++ b/.github/workflows/node-sass.yml
@@ -7,9 +7,8 @@ on:
pull_request:
env:
- CI: true
FORCE_COLOR: 2
- NODE: 14.x
+ NODE: 14
jobs:
css:
@@ -20,7 +19,7 @@ jobs:
uses: actions/checkout@v2
- name: Set up Node.js
- uses: actions/setup-node@v1
+ uses: actions/setup-node@v2
with:
node-version: "${{ env.NODE }}"
diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml
index 1c4f4be9b..ab2f37694 100644
--- a/.github/workflows/release-notes.yml
+++ b/.github/workflows/release-notes.yml
@@ -8,6 +8,7 @@ on:
jobs:
update_release_draft:
runs-on: ubuntu-latest
+ if: github.repository == 'twbs/bootstrap'
steps:
- uses: release-drafter/release-drafter@v5
env: