Skip to content

Commit 7542bb5

Browse files
committed
Merge branch 'master' of github.com:gchq/stroom
2 parents d1eb774 + 4e4d840 commit 7542bb5

File tree

4,511 files changed

+202867
-92490
lines changed

Some content is hidden

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

4,511 files changed

+202867
-92490
lines changed

Diff for: .github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
with:
3737
distribution: 'temurin' # See 'Supported distributions' for available options
3838
#distribution: 'zulu' # See 'Supported distributions' for available options
39-
java-version: '17'
39+
java-version: '21'
4040

4141
- name: Checkout repository
4242
uses: actions/checkout@v2

Diff for: .github/workflows/scripts/create_github_release.sh

+13-12
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,14 @@ main() {
4949

5050
setup_echo_colours
5151

52-
# Use Github's hub CLI to create our release
53-
# See https://github.com/github/hub
5452
echo -e "${GREEN}Finding asset files for release${NC}"
55-
local args=()
53+
local asset_files=()
5654
for asset_file in "${BUILD_DIR}/release_artefacts/"*; do
5755
echo -e "${GREEN}Found asset file: ${BLUE}${asset_file}${NC}"
58-
args+=(
59-
"--attach"
60-
"${asset_file}"
61-
)
56+
asset_files+=("${asset_file}")
6257
done
6358

59+
local args=()
6460
if [[ ${GITHUB_REF} =~ .*(beta|alpha).* ]]; then
6561
echo -e "${GREEN}Release is a pre-release${NC}"
6662
args+=("--prerelease")
@@ -81,13 +77,18 @@ main() {
8177
echo -e "${DGREY}${message}${NC}"
8278
echo -e "${DGREY}------------------------------------------------------------------------${NC}"
8379

84-
# Extract the subject/body from the annotated git tag
85-
hub release create \
86-
-m "${message}" \
80+
81+
# Create the release on GitHub using the annotated tag that triggered
82+
# this build
83+
# See https://cli.github.com/manual/gh_release_create
84+
gh release create \
85+
--title "${BUILD_TAG}" \
86+
--notes "${message}" \
87+
--verify-tag \
8788
"${args[@]}" \
88-
"${BUILD_TAG}"
89+
"${BUILD_TAG}" \
90+
"${asset_files[@]}"
8991

90-
#hub release create "${args[@]}" "$BUILD_TAG"
9192
echo "${GREEN}Release created for tag ${BLUE}${BUILD_TAG}${NC}"
9293
}
9394

Diff for: .idea/runConfigurations/Stroom_Create_Admin_Identity_Account.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: .idea/runConfigurations/Stroom_Create_Admin_Permissions.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: .idea/runConfigurations/Stroom_Grant_admin_to_IDP_user.xml

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: .sdkmanrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Enable auto-env through the sdkman_auto_env config
22
# Add key=value pairs of SDKs to use below
3-
java=17.0.1-tem
3+
java=21.0.2-tem
44

Diff for: BREAKING_CHANGES.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Breaking Change Log
2+
3+
All breaking changes to this project will be documented in this file.
4+
5+
The format is based on [Keep a Changelog](http://keepachangelog.com/)
6+
and this project adheres to [Semantic Versioning](http://semver.org/).
7+
8+
9+
## [v7.2]
10+
11+
* Quoted strings in dashboard table expressions can now be expressed with single and double quotes. As part of this change apostrophes in text are no longer escaped with `''` but instead require a leading `\` before them if they are in a single quoted string. In many cases it is preferable to use double quotes if the string in question has an apostrophe. Note that the use of `\` as an escape character also means that any existing `\` characters will need to be escaped with a preceding `\` so `\` must now become `\\`.

0 commit comments

Comments
 (0)