Skip to content

Commit

Permalink
Merge branch 'cnd' into cnd-cpplite-blend
Browse files Browse the repository at this point in the history
  • Loading branch information
jlahoda committed Nov 14, 2023
2 parents bd85cfc + 8272f00 commit 9cfc17d
Show file tree
Hide file tree
Showing 13,524 changed files with 661,753 additions and 222,212 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 9 additions & 1 deletion .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# doc: https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features

github:
description: "Apache NetBeans"
homepage: https://netbeans.apache.org/
Expand All @@ -28,9 +30,15 @@ github:
issues: true
projects: true
enabled_merge_buttons:
squash: true
squash: false
merge: true
rebase: true
protected_branches:
# no force push to master
master: {}
collaborators:
- asbachb

notifications:
commits: [email protected]
issues: [email protected]
Expand Down
53 changes: 31 additions & 22 deletions .github/ISSUE_TEMPLATE/netbeans_bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ body:
Latest releases are always available from https://netbeans.apache.org/download/
multiple: false
options:
- "Apache NetBeans 13"
# - "Apache NetBeans 14 release candidate"
- "Apache NetBeans 19"
# - "Apache NetBeans 20 release candidate"
- "Apache NetBeans latest daily build"
validations:
required: true
Expand Down Expand Up @@ -63,12 +63,13 @@ body:
specified in the description.
multiple: false
options:
- "No"
- "Apache NetBeans 13"
- "Apache NetBeans 12.6"
- "Apache NetBeans 12.5"
- "Apache NetBeans 12.4"
- "Apache NetBeans 12.3 or earlier"
- "No / Don't know"
- "Apache NetBeans 18"
- "Apache NetBeans 17"
- "Apache NetBeans 16"
- "Apache NetBeans 15"
- "Apache NetBeans 14"
- "Apache NetBeans 13 or earlier"
validations:
required: true
- type: input
Expand All @@ -91,7 +92,7 @@ body:
description: >
Please select the Apache NetBeans package you're using. Provide additional details
below if necessary.
multiple: false
multiple: true
options:
- "Apache NetBeans provided installer"
- "Apache NetBeans binary zip"
Expand Down Expand Up @@ -121,23 +122,31 @@ body:
This is absolutely not required, but we are happy to guide you in the contribution process,
especially if you already have a good understanding of how to implement the fix. <br>
Apache NetBeans is a community-managed project and we love to bring new contributors in.
options:
- "Yes"
- "No"
validations:
required: true
- type: dropdown
attributes:
label: Code of Conduct
description: >
The Code of Conduct helps create a safe space for everyone.
I agree to follow the Apache Software Foundation's
[Code of Conduct](https://www.apache.org/foundation/policies/conduct.html)
options:
- "Yes"
validations:
required: true
# - type: dropdown
# attributes:
# label: Code of Conduct
# description: >
# The Code of Conduct helps create a safe space for everyone.
# I agree to follow the Apache Software Foundation's
# [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html)
# options:
# - "Yes"
# validations:
# required: true
# - type: markdown
# attributes:
# value: "Thank you for completing our form!"
- type: markdown
attributes:
value: "Thank you for completing our form!"
value: "**By submitting this form you agree to follow the Apache Software Foundation's
[Code of Conduct](https://www.apache.org/foundation/policies/conduct.html)**.
The Code of Conduct helps create a safe space for everyone.
Thank you for completing our form!"
42 changes: 28 additions & 14 deletions .github/ISSUE_TEMPLATE/netbeans_feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,38 @@ body:
attributes:
label: Related issues
description: Is there currently another issue associated with this?
- type: checkboxes
- type: dropdown
attributes:
label: Are you willing to submit a PR?
label: Are you willing to submit a pull request?
description: >
This is absolutely not required, but we are happy to guide you in the contribution process,
especially if you already have a good understanding of how to implement the fix.
especially if you already have a good understanding of how to implement the fix. <br>
Apache NetBeans is a community-managed project and we love to bring new contributors in.
options:
- label: Yes I am willing to submit a PR!
- type: checkboxes
attributes:
label: Code of Conduct
description: The Code of Conduct helps create a safe space for everyone.
options:
- label: >
I agree to follow the Apache Software Foundation's
[Code of Conduct](https://www.apache.org/foundation/policies/conduct.html)
required: true
- "No"
- "Yes"
validations:
required: true
# - type: dropdown
# attributes:
# label: Code of Conduct
# description: >
# The Code of Conduct helps create a safe space for everyone.
# I agree to follow the Apache Software Foundation's
# [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html)
# options:
# - "Yes"
# validations:
# required: true
# - type: markdown
# attributes:
# value: "Thank you for completing our form!"
- type: markdown
attributes:
value: "Thanks for completing our form!"
value: "**By submitting this form you agree to follow the Apache Software Foundation's
[Code of Conduct](https://www.apache.org/foundation/policies/conduct.html)**.
The Code of Conduct helps create a safe space for everyone.
Thank you for completing our form!"
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ Please make sure (eg. `git log`) that all commits have a valid name and email ad

If you're a first time contributor, see the Contributing guidelines for more information.

If you're a committer, please label the PR before pressing "Create pull request" so that the right test jobs can run.
116 changes: 116 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations

# doc: https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuration-options
changelog:

exclude:

labels:
- 'Release process'
- 'ci:no-build'

# order matters since this works like a filter, a PR will show up only once.
# try to keep similar categories together since this is also the rendering order.
categories:

- title: 'Gradle'
labels:
- 'Gradle'

- title: 'Maven'
labels:
- 'Maven'

- title: 'Ant'
labels:
- 'Ant'

- title: 'Java'
labels:
- 'Java'
- 'JavaDoc'

- title: 'JavaFX'
labels:
- 'JavaFX'

- title: 'Groovy'
labels:
- 'Groovy'

- title: 'PHP'
labels:
- 'PHP'

- title: 'C/C++'
labels:
- 'C/C++'

- title: 'Enterprise'
labels:
- 'enterprise'
- 'Java EE/Jakarta EE'
- 'Micronaut'
- 'Payara'

- title: 'Web'
labels:
- 'JavaScript'
- 'TypeScript'
- 'HTML'
- 'CSS'
- 'CSL'

- title: 'Versioning'
labels:
- 'git'
- 'subversion'
- 'mercurial'

- title: 'Editor'
labels:
- 'Editor'
- 'ANTLR'
- 'Docker'

- title: 'UI Changes'
labels:
- 'UI'
- 'Look and Feel'

- title: 'Platform'
labels:
- 'Platform'

- title: 'Language Server Protocol'
labels:
- 'LSP'

- title: 'VSCode Extension'
labels:
- 'VSCode Extension'

- title: 'Maintanance'
labels:
- 'Code cleanup'
- 'Upgrade Library'
- 'dependencies'
- 'CI'

- title: Other Changes
labels:
- "*"
29 changes: 29 additions & 0 deletions .github/retry.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/bin/bash

# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

TEST=$(getopt -q -a "f:" $@ | cut -d ' ' -f3)
{
$@
} || {
echo "::warning::$TEST failed: starting retry 1"
$@
} || {
echo "::warning::$TEST failed: starting retry 2"
$@
}
Loading

0 comments on commit 9cfc17d

Please sign in to comment.