Skip to content

Commit 935e689

Browse files
authored
Merge branch 'main' into feat/enterprise-ip-allow-list
2 parents eb02154 + f4a5b1a commit 935e689

3,871 files changed

Lines changed: 123984 additions & 534545 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Whitespace-only changes.

.github/labeler.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Configuration for labeler - https://github.com/actions/labeler
2+
"Type: Breaking change":
3+
- head-branch:
4+
- '^breaking/'
5+
- '^breaking-'
6+
7+
"Type: Feature":
8+
- head-branch:
9+
- '^feat/'
10+
- '^feat-'
11+
- '^feature/'
12+
- '^feature-'
13+
14+
"Type: Bug":
15+
- head-branch:
16+
- '^fix/'
17+
- '^fix-'
18+
- '^bugfix/'
19+
- '^bugfix-'
20+
- '^bug/'
21+
- '^bug-'
22+
23+
"Deprecation":
24+
- head-branch:
25+
- '^deprecate/'
26+
- '^deprecate-'
27+
- '^deprecation/'
28+
- '^deprecation-'
29+
30+
"Type: Maintenance":
31+
- head-branch:
32+
- '^chore/'
33+
- '^chore-'
34+
- '^maintenance/'
35+
- '^maintenance-'
36+
- '^maint/'
37+
- '^maint-'
38+
- '^deps/'
39+
- '^deps-'
40+
- '^dependencies/'
41+
- '^dependencies-'
42+
# - changed-files:
43+
# - any-glob-to-any-file:
44+
# - .github/workflows/**
45+
# - .github/labeler.yml
46+
# - .github/dependabot.yml
47+
# - .github/release.yml
48+
49+
"Type: Documentation":
50+
- head-branch:
51+
- '^docs/'
52+
- '^docs-'
53+
- '^doc/'
54+
- '^doc-'
55+
# - changed-files:
56+
# - any-glob-to-any-file: 'website/**'

.github/pull_request_template.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@ Resolves #ISSUE_NUMBER
77
### Before the change?
88
<!-- Please describe the current behavior that you are modifying. -->
99

10-
*
10+
-
1111

1212
### After the change?
1313
<!-- Please describe the behavior or changes that are being added by this PR. -->
1414

15-
*
15+
-
1616

1717
### Pull request checklist
18+
19+
- [ ] Schema migrations have been created if needed ([example](https://github.com/F-Secure-web/terraform-provider-github/blob/main/github/migrate_github_actions_organization_secret.go))
1820
- [ ] Tests for the changes have been added (for bug fixes / features)
1921
- [ ] Docs have been reviewed and added / updated if needed (for bug fixes / features)
2022

@@ -27,4 +29,3 @@ Please see our docs on [breaking changes](https://github.com/octokit/.github/blo
2729
- [ ] No
2830

2931
----
30-

.github/workflows/add_to_octokit_project.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/ci.yaml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- release-v*
8+
pull_request:
9+
branches:
10+
- main
11+
- release-v*
12+
13+
concurrency:
14+
group: ci-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
permissions: read-all
18+
19+
jobs:
20+
ci:
21+
name: Continuous Integration
22+
runs-on: ubuntu-latest
23+
permissions:
24+
contents: read
25+
defaults:
26+
run:
27+
shell: bash
28+
steps:
29+
- name: Checkout
30+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
31+
- name: Set-up Go
32+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
33+
with:
34+
go-version-file: go.mod
35+
cache: true
36+
- run: make tools
37+
- run: make lintcheck
38+
- run: make website-lint
39+
- run: make build
40+
- run: make test

.github/workflows/ci.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/workflows/codeql.yaml

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: CodeQL
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches: ["main"]
7+
pull_request:
8+
# The branches below must be a subset of the branches above
9+
branches: ["main"]
10+
schedule:
11+
- cron: "16 7 * * 5"
12+
13+
concurrency:
14+
group: codeql-${{ github.ref }}
15+
cancel-in-progress: true
16+
17+
permissions: read-all
18+
19+
jobs:
20+
analyze:
21+
name: Analyze (${{ matrix.language }})
22+
runs-on: ubuntu-latest
23+
permissions:
24+
actions: read
25+
contents: read
26+
security-events: write
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
include:
31+
- language: actions
32+
build-mode: none
33+
queries: security-extended # can be 'default' (use empty for 'default'), 'security-and-quality', 'security-extended'
34+
- language: go
35+
build-mode: manual
36+
queries: "" # will be used 'default' queries
37+
defaults:
38+
run:
39+
shell: bash
40+
steps:
41+
- name: Checkout
42+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
43+
44+
- name: Set-up Go
45+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
46+
if: matrix.language == 'go'
47+
with:
48+
go-version-file: go.mod
49+
cache: true
50+
51+
- name: Initialize CodeQL
52+
uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
53+
with:
54+
languages: ${{ matrix.language }}
55+
build-mode: ${{ matrix.build-mode }}
56+
queries: ${{ matrix.queries }}
57+
58+
- name: Build Go
59+
if: ${{ matrix.language == 'go' }}
60+
run: go build ./...
61+
62+
- name: Perform CodeQL Analysis
63+
uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
64+
with:
65+
category: "/language:${{matrix.language}}"
66+
67+
check:
68+
name: Check CodeQL Analysis
69+
if: always() && github.event_name == 'pull_request'
70+
needs:
71+
- analyze
72+
runs-on: ubuntu-latest
73+
defaults:
74+
run:
75+
shell: bash
76+
steps:
77+
- name: Check
78+
env:
79+
INPUT_RESULTS: ${{ join(needs.*.result, ' ') }}
80+
run: |
81+
set -euo pipefail
82+
read -a results <<< "${INPUT_RESULTS}"
83+
for result in "${results[@]}"; do
84+
if [[ "${result}" == "failure" ]] || [[ "${result}" == "cancelled" ]]; then
85+
echo "::error::Workflow failed!"
86+
exit 1
87+
fi
88+
done

.github/workflows/codeql.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)