Skip to content

Commit 5079a00

Browse files
axeluhlaxeluhl
committed
Merge branch 'main' into management-console
2 parents 47b52c8 + 626d162 commit 5079a00

1,726 files changed

Lines changed: 407464 additions & 52021 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/workflows/play-with-docker.yml renamed to .github/workflows/create-docker-image.yml

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
1-
name: play-with-docker
1+
name: Create Docker Image
22
on:
3+
workflow_run:
4+
workflows: [release]
5+
types: [completed]
6+
branches: [main, docker-17]
37
workflow_dispatch:
48
inputs:
59
release:
610
description: Release
711
default: ''
812
jobs:
9-
play-with-docker-job:
13+
create-docker-image-job:
14+
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
1015
runs-on: ubuntu-latest
1116
steps:
1217
- name: Checkout
1318
uses: actions/checkout@v4
14-
# - name: Login to docker.sapsailing.com for sapjvm8 image download
15-
# uses: docker/login-action@v3
16-
# with:
17-
# registry: docker.sapsailing.com
18-
# username: ${{ secrets.DOCKER_SAPSAILING_COM_USERNAME }}
19-
# password: ${{ secrets.DOCKER_SAPSAILING_COM_PASSWORD }}
19+
with:
20+
ref: ${{ github.event_name == 'workflow_dispatch' && github.workflow_dispatch.ref || github.event.workflow_run.head_branch }}
21+
- name: Set up QEMU
22+
uses: docker/setup-qemu-action@v3
23+
- name: Set up Docker Buildx
24+
uses: docker/setup-buildx-action@v3
2025
- name: Login to ghcr.io to upload sailing-analytics image
2126
uses: docker/login-action@v3
2227
with:
@@ -32,8 +37,9 @@ jobs:
3237
- name: Determine release
3338
shell: bash
3439
run: |
35-
echo "RELEASE_PREFIX=$( if [ "${{ github.event.inputs.release }}" = "" ]; then
36-
echo 'main-' # use the latest main-... release available
40+
echo "BRANCH=$( git branch --show-current )
41+
RELEASE_PREFIX=$( if [ "${{ github.event.inputs.release }}" = "" ]; then
42+
echo "$( git branch --show-current )-"
3743
else
3844
echo "${{ github.event.inputs.release }}"
3945
fi )
@@ -51,9 +57,14 @@ jobs:
5157
uses: docker/build-push-action@v5
5258
with:
5359
build-args: RELEASE=${{ env.RELEASE }}
54-
tags: ghcr.io/sap/sailing-analytics:${{ env.RELEASE }}${{ github.ref == 'refs/heads/main' && github.event.inputs.release == '' && ',ghcr.io/sap/sailing-analytics:latest' || '' }}
55-
file: docker/Dockerfile
60+
tags: ghcr.io/sap/sailing-analytics:${{ env.RELEASE }}${{ env.BRANCH == 'main' && github.event.inputs.release == '' && ',ghcr.io/sap/sailing-analytics:latest' || env.BRANCH == 'docker-17' && github.event.inputs.release == '' && ',ghcr.io/sap/sailing-analytics:latest-17' || '' }}
61+
annotations: |
62+
maintainer=axel.uhl@sap.com
63+
index:org.opencontainers.image.title=Sailing Analytics
64+
index:org.opencontainers.image.description=The Sailing Analytics Web Application
65+
file: ${{ env.BRANCH == 'docker-17' && 'docker/Dockerfile_sapsailing_on_sapmachine17' || 'docker/Dockerfile' }}
5666
context: docker/
67+
platforms: linux/amd64,linux/arm64
5768
push: true
5869
- name: Clean up copied files
5970
shell: bash

‎.github/workflows/manual-release-test.yml‎

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

‎.github/workflows/merge-main-into-docker-17.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Merge main branch into docker-17 after successful build
2+
on:
3+
workflow_run:
4+
workflows: [release]
5+
types: [completed]
6+
branches: [main]
7+
workflow_dispatch: {}
8+
jobs:
9+
merge-main-into-docker-17:
10+
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v4
15+
with:
16+
ref: docker-17
17+
fetch-depth: 0 # fetch the whole thing to make sure the histories merge
18+
- name: Merge main into docker-17
19+
uses: devmasx/merge-branch@master
20+
env:
21+
GH_TOKEN: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}
22+
with:
23+
type: now
24+
from_branch: main
25+
target_branch: docker-17
26+
message: Auto-merging main into docker-17 after successful release build
27+
github_token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}

‎.github/workflows/merge-sapsailing-com-main.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# One of the reasons to have this workflow is that the Gollum-based Wiki
2+
# at wiki.sapsailing.com is operating on a Git workspace at wiki@sapsailing.com:gitwiki
3+
# which has been cloned from ssh://trac@sapsailing.com/home/trac/git. Its changes
4+
# shall be synchronized to the Github repo at github.com/SAP/sailing-analytics
5+
name: Merge main from trac@sapsailing.com:/home/trac/git
6+
on:
7+
schedule:
8+
- cron: "53 * * * *" # every hour, at :53 minutes
9+
workflow_dispatch: {}
10+
jobs:
11+
merge-master-from-sapsailing-com:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0 # fetch the whole thing to make sure the histories merge
18+
- name: Create SSH key and fetch repo from sapsailing.com
19+
shell: bash
20+
run: |
21+
mkdir -p ~/.ssh
22+
chmod 700 ~/.ssh
23+
echo "${{ secrets.SSH_PRIVATE_KEY_FOR_TRAC_SAPSAILING_COM }}" >~/.ssh/id_ed25519
24+
chmod 600 ~/.ssh/id_ed25519
25+
git remote add sapsailing ssh://trac@sapsailing.com/home/trac/git
26+
git remote -v
27+
GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git fetch sapsailing main:sapsailing_main
28+
GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" git push -f origin sapsailing_main:sapsailing_main
29+
- name: Merge sapsailing/main into main
30+
uses: devmasx/merge-branch@master
31+
env:
32+
GH_TOKEN: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}
33+
with:
34+
type: now
35+
from_branch: sapsailing_main
36+
target_branch: main
37+
message: Auto-merging sapsailing/main into github/main
38+
github_token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}
39+

‎.github/workflows/release.yml‎

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,32 @@ on:
55
- 'wiki/**'
66
- '.github/workflows/*'
77
- '**/*.md'
8-
workflow_dispatch: {}
8+
workflow_dispatch:
9+
inputs:
10+
skip_tests:
11+
description: Skip tests (set to "true" to skip all tests)
12+
default: 'false'
13+
local_target_platform:
14+
description: Build with a local target platform (set to "true" to use local target platform)
15+
default: 'false'
16+
917
jobs:
1018
build:
1119
runs-on: ubuntu-latest-64cpu
1220
#runs-on: ubuntu-latest-4cpu
1321
steps:
22+
- name: Allocate swap space
23+
shell: bash
24+
run: |
25+
sudo dd if=/dev/zero of=/mnt/large-swapfile bs=1G count=10
26+
sudo chmod 600 /mnt/large-swapfile
27+
sudo mkswap /mnt/large-swapfile
28+
sudo chown root:root /mnt/large-swapfile
29+
sudo swapon /mnt/large-swapfile
30+
- name: Collect Workflow Telemetry
31+
uses: catchpoint/workflow-telemetry-action@v2
32+
with:
33+
comment_on_pr: false
1434
- name: Check out the repository to the runner
1535
uses: actions/checkout@v4
1636
with:
@@ -27,9 +47,9 @@ jobs:
2747
log-accepted-android-sdk-licenses: 'false'
2848
cmdline-tools-version: 9123335 # This corresponds to human-friendly version number 8.0
2949
- name: Start MongoDB
30-
uses: supercharge/mongodb-github-action@1.10.0
50+
uses: supercharge/mongodb-github-action@1.11.0
3151
with:
32-
mongodb-version: 4.4
52+
mongodb-version: 7.0
3353
- name: Start RabbitMQ
3454
uses: namoshek/rabbitmq-github-action@v1
3555
with:
@@ -40,7 +60,7 @@ jobs:
4060
APP_PARAMETERS: "-Daws.region=eu-west-1 -Dgoogle.maps.authenticationparams=${{ secrets.GOOGLE_MAPS_AUTHENTICATIONPARAMS }} -Daws.s3.test.s3AccessId=${{ secrets.AWS_S3_TEST_S3ACCESSID }} -Daws.s3.test.s3AccessKey=${{ secrets.AWS_S3_TEST_S3ACCESSKEY }}"
4161
JAVA8_HOME: ${{env.JAVA_HOME_8_X64}}
4262
run: |
43-
./configuration/buildAndUpdateProduct.sh -x 60 build 2>&1 | tee build.log
63+
./configuration/buildAndUpdateProduct.sh -x 60 ${{ github.event.inputs.skip_tests == 'true' && '-t' || '' }} ${{ github.event.inputs.local_target_platform == 'true' && '-v' || '' }} build 2>&1
4464
- name: Upload build log
4565
uses: actions/upload-artifact@v4
4666
if: always()
@@ -59,10 +79,11 @@ jobs:
5979
list-tests: failed
6080
reporter: java-junit
6181
fail-on-error: true
62-
- shell: bash
82+
- name: Build Release
6383
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/docker-17' || startsWith(github.ref, 'refs/heads/releases/') }}
84+
shell: bash
6485
run: |
65-
./configuration/buildAndUpdateProduct.sh -u -L release
86+
./configuration/buildAndUpdateProduct.sh -u -L ${{ github.event.inputs.skip_tests == 'true' && '-n untested' || '' }} release
6687
- name: Determine release name
6788
run: |
6889
echo "SIMPLE_VERSION_INFO=$( basename dist/* )" >>${GITHUB_ENV}
@@ -84,12 +105,10 @@ jobs:
84105
- name: Create Release
85106
id: create_release
86107
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/docker-17' || startsWith(github.ref, 'refs/heads/releases/') }}
87-
uses: actions/create-release@v1
88-
env:
89-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
108+
uses: softprops/action-gh-release@v2
90109
with:
91110
tag_name: ${{ env.SIMPLE_VERSION_INFO }}
92-
release_name: ${{ env.SIMPLE_VERSION_INFO }}
111+
name: ${{ env.SIMPLE_VERSION_INFO }}
93112
draft: false
94113
prerelease: false
95114
- name: Upload Release Asset tar.gz
@@ -119,7 +138,11 @@ jobs:
119138
shell: bash
120139
run: |
121140
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
122-
JOB=SAPSailingAnalytics-master
141+
if [ "${{ github.event.inputs.skip_tests }}" = "true" ]; then
142+
JOB=SAPSailingAnalytics-master-fasttrack-no-tests
143+
else
144+
JOB=SAPSailingAnalytics-master
145+
fi
123146
elif [[ "${{ github.ref }}" =~ refs/heads/releases/.* ]]; then
124147
JOB=$( echo "${{ github.ref }}" | sed -e 's/^refs\/heads\/releases\///' )
125148
else

‎.github/workflows/test-hudson-trigger.yml‎

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

‎.pipeline/README‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
This folder contains an Azure pipeline definition that is used for building our
2+
Android companion apps, in particular the Sailing Race Manager app and the
3+
Buoy Pinger app. See also the mobile/ folder for their source code. The
4+
gradle build that is used at the core of this build pipeline is controlled
5+
by the ``build.gradle``and ``gradle.properties`` file in the root folder.
6+
A local Android app build can be achieved by running the ``gradlew``
7+
wrapper script from the root folder.

‎.reuse/README‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
This folder is used by the workflow defined in ``.github/workflows/reuse-tool-license-updates.yml``
2+
and produces machine-readable licensing information for the entire repository into the dep5 file
3+
in this same folder.

‎Gemfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
source "https://rubygems.org"
22

3-
gem 'highline', '> 0'
4-
gem 'json', '> 0'
5-
gem 'fastlane', '> 0'
3+
platform :ruby do
4+
gem 'highline', '> 0'
5+
gem 'json', '> 0'
6+
gem 'fastlane', '> 0'
67

7-
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
8-
eval_gemfile(plugins_path) if File.exist?(plugins_path)
8+
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
9+
eval_gemfile(plugins_path) if File.exist?(plugins_path)
10+
end

0 commit comments

Comments
 (0)