[netbeans-website] branch master updated: remove no-daemon for test purpose
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new b8a1f79d1 remove no-daemon for test purpose b8a1f79d1 is described below commit b8a1f79d1d8914e64f1b3ff9a75329a27d4d8f3c Author: Eric Barboni AuthorDate: Tue Sep 19 13:53:47 2023 +0200 remove no-daemon for test purpose --- Jenkinsfile.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index f087996a3..5567d301a 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -90,7 +90,7 @@ pipeline { sh 'chmod u+x ./gradlew' sh './gradlew --version' sh './gradlew --stop' -sh './gradlew --no-daemon clean buildSite' +sh './gradlew clean buildSite' } } } - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] branch master updated: add debug info
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new 4ec8d72cb add debug info 4ec8d72cb is described below commit 4ec8d72cbb5e32e97116134a498aebb0c9ead027 Author: Eric Barboni AuthorDate: Tue Sep 19 14:09:55 2023 +0200 add debug info (works perfectly localy need to investigate on ci) --- Jenkinsfile.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 5567d301a..5f0a333d1 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -90,7 +90,7 @@ pipeline { sh 'chmod u+x ./gradlew' sh './gradlew --version' sh './gradlew --stop' -sh './gradlew clean buildSite' +sh './gradlew --no-daemon --stacktrace clean buildSite' } } } - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] branch master updated: more debug for ci
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new 00c886a41 more debug for ci 00c886a41 is described below commit 00c886a41960f91f2b784387dac4fcbeb13e3701 Author: Eric Barboni AuthorDate: Tue Sep 19 14:26:30 2023 +0200 more debug for ci --- Jenkinsfile.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 5f0a333d1..9ea2dc9bc 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -90,7 +90,7 @@ pipeline { sh 'chmod u+x ./gradlew' sh './gradlew --version' sh './gradlew --stop' -sh './gradlew --no-daemon --stacktrace clean buildSite' +sh './gradlew --no-daemon --stacktrace --debug clean buildSite' } } } - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] branch master updated: split target
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new 3e39ea039 split target 3e39ea039 is described below commit 3e39ea0396a89c29341826675141f44785e8dbb9 Author: Eric Barboni AuthorDate: Tue Sep 19 15:13:15 2023 +0200 split target --- Jenkinsfile.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 9ea2dc9bc..0174c1732 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -90,7 +90,8 @@ pipeline { sh 'chmod u+x ./gradlew' sh './gradlew --version' sh './gradlew --stop' -sh './gradlew --no-daemon --stacktrace --debug clean buildSite' +sh './gradlew clean --no-daemon ' +sh './gradlew buildSite --no-daemon --stacktrace --debug' } } } - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] branch master updated: test no build cache
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new 13a1aad8b test no build cache 13a1aad8b is described below commit 13a1aad8b71d93a21f8654f6c7fc5e5100dd10d0 Author: Eric Barboni AuthorDate: Tue Sep 19 16:33:00 2023 +0200 test no build cache --- Jenkinsfile.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 0174c1732..3cae5d637 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -90,8 +90,8 @@ pipeline { sh 'chmod u+x ./gradlew' sh './gradlew --version' sh './gradlew --stop' -sh './gradlew clean --no-daemon ' -sh './gradlew buildSite --no-daemon --stacktrace --debug' +sh './gradlew clean --no-daemon' +sh './gradlew buildSite --no-daemon --no-build-cache --stacktrace' } } } - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] branch master updated: ci build fix attempt
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new 769e964d8 ci build fix attempt 769e964d8 is described below commit 769e964d802c5fe404c701bc0db698af9d35225a Author: Eric Barboni AuthorDate: Tue Sep 19 17:40:15 2023 +0200 ci build fix attempt --- netbeans.apache.org/gradlew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbeans.apache.org/gradlew b/netbeans.apache.org/gradlew index a69d9cb6c..c9d1b65b6 100755 --- a/netbeans.apache.org/gradlew +++ b/netbeans.apache.org/gradlew @@ -86,7 +86,7 @@ APP_NAME="Gradle" APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS='"-Xmx1024m" "-Xms1024m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] branch master updated: gradle.properties to manage memory settings
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new 66f5eace0 gradle.properties to manage memory settings 66f5eace0 is described below commit 66f5eace057e79a0040fdbf0b638003bad855cf8 Author: Eric Barboni AuthorDate: Tue Sep 19 18:30:23 2023 +0200 gradle.properties to manage memory settings --- netbeans.apache.org/gradle.properties | 15 +++ 1 file changed, 15 insertions(+) diff --git a/netbeans.apache.org/gradle.properties b/netbeans.apache.org/gradle.properties new file mode 100644 index 0..3013e9e83 --- /dev/null +++ b/netbeans.apache.org/gradle.properties @@ -0,0 +1,15 @@ +# 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. +org.gradle.jvmargs=-Xmx2g -Xss4m - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Switch CI from JDK 21-ea to 21-ga.
This is an automated email from the ASF dual-hosted git repository. mbien pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new ac9bdbb911 Switch CI from JDK 21-ea to 21-ga. new 7394c0c6f9 Merge pull request #6469 from mbien/ci-jdk-21ga ac9bdbb911 is described below commit ac9bdbb91166747abd2e1824ac84a247a14ec57b Author: Michael Bien AuthorDate: Wed Sep 20 06:12:57 2023 +0200 Switch CI from JDK 21-ea to 21-ga. --- .github/workflows/main.yml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eb23af28a5..8a8c94afca 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -96,7 +96,7 @@ jobs: timeout-minutes: 60 strategy: matrix: -java: [ '11', '17', '21-ea' ] +java: [ '11', '17', '21' ] fail-fast: false steps: @@ -120,7 +120,7 @@ jobs: restore-keys: ${{ runner.os }}- - name: Setup Gradle Daemon to run on JDK 11 -if: ${{ matrix.java == '21-ea' }} +if: ${{ matrix.java == '21' }} run: | mkdir -p ~/.gradle #uses a preinstalled JDK 11 from the runner @@ -192,7 +192,7 @@ jobs: timeout-minutes: 60 strategy: matrix: -java: [ '11', '17', '21-ea' ] +java: [ '11', '17', '21' ] fail-fast: false steps: @@ -1771,7 +1771,7 @@ jobs: macos: name: Tests on MacOS/JDK ${{ matrix.java }} needs: base-build -runs-on: macos-11 +runs-on: macos-latest timeout-minutes: 90 strategy: matrix: - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Add "After Use Trait" to the formatting options #4685
This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 161f65c97d Add "After Use Trait" to the formatting options #4685 new b0fc0d628e Merge pull request #6467 from junichi11/php-formatter-after-use-trait 161f65c97d is described below commit 161f65c97dd8d9dade357bb3621453bd81a5ec68 Author: Junichi Yamamoto AuthorDate: Fri Sep 15 14:44:56 2023 +0900 Add "After Use Trait" to the formatting options #4685 - https://github.com/apache/netbeans/issues/4685 - Add "After Use Trait" option - Add unit tests --- .../modules/php/editor/indent/CodeStyle.java | 4 ++ .../modules/php/editor/indent/FmtOptions.java | 2 + .../modules/php/editor/indent/FormatToken.java | 1 + .../modules/php/editor/indent/FormatVisitor.java | 11 +++ .../modules/php/editor/indent/TokenFormatter.java | 6 ++ .../modules/php/editor/indent/ui/Bundle.properties | 2 + .../php/editor/indent/ui/FmtBlankLines.form| 78 +- .../php/editor/indent/ui/FmtBlankLines.java| 71 .../formatting/blankLines/AfterUseTrait_01.php | 52 +++ ...php.testAfterUseTraitHasBlankLine_01a.formatted | 57 ...php.testAfterUseTraitHasBlankLine_01b.formatted | 62 + php.testAfterUseTraitNoBlankLine_01a.formatted | 55 +++ php.testAfterUseTraitNoBlankLine_01b.formatted | 62 + .../editor/indent/PHPFormatterBlankLinesTest.java | 40 +++ 14 files changed, 443 insertions(+), 60 deletions(-) diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/indent/CodeStyle.java b/php/php.editor/src/org/netbeans/modules/php/editor/indent/CodeStyle.java index a1ba761f73..885c6ff243 100644 --- a/php/php.editor/src/org/netbeans/modules/php/editor/indent/CodeStyle.java +++ b/php/php.editor/src/org/netbeans/modules/php/editor/indent/CodeStyle.java @@ -172,6 +172,10 @@ public final class CodeStyle { return preferences.getInt(BLANK_LINES_BEFORE_USE_TRAIT, getDefaultAsInt(BLANK_LINES_BEFORE_USE_TRAIT)); } +public int getBlankLinesAfterUseTrait() { +return preferences.getInt(BLANK_LINES_AFTER_USE_TRAIT, getDefaultAsInt(BLANK_LINES_AFTER_USE_TRAIT)); +} + public int getBlankLinesAfterUse() { return preferences.getInt(BLANK_LINES_AFTER_USE, getDefaultAsInt(BLANK_LINES_AFTER_USE)); } diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/indent/FmtOptions.java b/php/php.editor/src/org/netbeans/modules/php/editor/indent/FmtOptions.java index 24d05c20a4..5ba623e44a 100644 --- a/php/php.editor/src/org/netbeans/modules/php/editor/indent/FmtOptions.java +++ b/php/php.editor/src/org/netbeans/modules/php/editor/indent/FmtOptions.java @@ -94,6 +94,7 @@ public final class FmtOptions { public static final String BLANK_LINES_AFTER_NAMESPACE = "blankLinesAfterNamespace"; //NOI18N public static final String BLANK_LINES_BEFORE_USE = "blankLinesBeforeUse"; //NOI18N public static final String BLANK_LINES_BEFORE_USE_TRAIT = "blankLinesBeforeUseTrait"; //NOI18N +public static final String BLANK_LINES_AFTER_USE_TRAIT = "blankLinesAfterUseTrait"; //NOI18N public static final String BLANK_LINES_AFTER_USE = "blankLinesAfterUse"; //NOI18N public static final String BLANK_LINES_BETWEEN_USE_TYPES = "blankLinesBetweenUseType"; //NOI18N public static final String BLANK_LINES_BEFORE_CLASS = "blankLinesBeforeClass"; //NOI18N @@ -289,6 +290,7 @@ public final class FmtOptions { {BLANK_LINES_AFTER_NAMESPACE, "1"}, //NOI18N {BLANK_LINES_BEFORE_USE, "1"}, //NOI18N {BLANK_LINES_BEFORE_USE_TRAIT, "1"}, //NOI18N +{BLANK_LINES_AFTER_USE_TRAIT, "1"}, //NOI18N {BLANK_LINES_AFTER_USE, "1"}, //NOI18N {BLANK_LINES_BETWEEN_USE_TYPES, "0"}, //NOI18N {BLANK_LINES_BEFORE_CLASS, "1"}, //NOI18N diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatToken.java b/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatToken.java index 4f464a826f..ec0d6cda7f 100644 --- a/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatToken.java +++ b/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatToken.java @@ -103,6 +103,7 @@ public class FormatToken { WHITESPACE_BEFORE_OTHER_RIGHT_BRACE, WHITESPACE_BEFORE_USES_PART, WHITESPACE_BEFORE_USE_TRAIT, +WHITESPACE_AFTER_USE_TRAIT, WHITESPACE_BEFORE_USE_TRAIT_PART, WHITESPACE_BEFORE_USE_TRAIT_BODY_LEFT_BRACE, WHITESPACE_BEFORE_USE_TRAIT_BODY_RIGHT_BRACE, diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java b/php/php.editor/src/org/netbeans/modules/php/editor/ind