Skip to content

Commit e3ba566

Browse files
RealCLangerRealCLanger
committed
Merge branch 'sapmachine' into pr-jdk-27+16
2 parents 2357f93 + c9a7eac commit e3ba566

File tree

164 files changed

+18324
-122
lines changed

Some content is hidden

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

164 files changed

+18324
-122
lines changed

‎.github/actions/upload-bundles/action.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,14 @@ runs:
4747
id: bundles
4848
run: |
4949
# Rename bundles to consistent names
50-
jdk_bundle_zip="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
51-
jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
52-
static_jdk_bundle_zip="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
53-
static_jdk_bundle_tar_gz="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
54-
symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
55-
tests_bundle="$(ls build/*/bundles/jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
56-
static_libs_bundle="$(ls build/*/bundles/jdk-*_bin-static-libs${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
50+
# SapMachine 2020-11-04: Adapt bundle names
51+
jdk_bundle_zip="$(ls build/*/bundles/sapmachine-jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
52+
jdk_bundle_tar_gz="$(ls build/*/bundles/sapmachine-jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
53+
static_jdk_bundle_zip="$(ls build/*/bundles/sapmachine-static-jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
54+
static_jdk_bundle_tar_gz="$(ls build/*/bundles/sapmachine-static-jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
55+
symbols_bundle="$(ls build/*/bundles/sapmachine-jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
56+
tests_bundle="$(ls build/*/bundles/sapmachine-jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
57+
static_libs_bundle="$(ls build/*/bundles/sapmachine-jdk-*_bin-static-libs${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
5758
5859
mkdir bundles
5960

‎.github/pull_request_template.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!-- General instructions for SapMachine PRs:
2+
3+
1. The title of a PR should be "SapMachine (<Release>) #<Issue Number>: <Description>"
4+
2. A PR needs to refer to an issue in the project by adding the issue number in the last line of the PR body in the form of 'fixes #<Issue Number>
5+
3. When integrating a PR, please make sure you:
6+
- Create a merge commit when merging an OpenJDK upstream PR
7+
- Use Rebase & Merge when your PR only contains commits with meaningful commit message, e.g. of the form `SapMachine #<Issue Number>: <Description>` for SapMachine specific changes or the original commit messages for cherry-picks from OpenJDK
8+
- Use Squash and Merge when there are several commits on the PR. Update the commit message to `SapMachine #<Issue Number>: <Description>` and remove unnecessary commit messages from sub-commits
9+
-->
10+
11+
<!-- Replace the following line with a description of this pull request -->
12+
Description
13+
14+
<!-- replace #Issue with the issue number that the PR is referring to. Otherwise PR testing will fail. -->
15+
fixes #Issue

‎.github/workflows/build-alpine-linux.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ jobs:
8787
with:
8888
platform: alpine-linux-x64
8989

90+
# SapMachine 2025-06-11: reduce number of cds/jsa archives
9091
- name: 'Configure'
9192
run: >
9293
bash configure
@@ -98,6 +99,7 @@ jobs:
9899
--with-jmod-compress=zip-1
99100
--with-external-symbols-in-bundles=none
100101
--with-native-debug-symbols-level=1
102+
--with-vendor-name="SAP SE"
101103
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
102104
echo "Dumping config.log:" &&
103105
cat config.log &&

‎.github/workflows/build-cross-compile.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ jobs:
166166
sudo rm -rf sysroot/
167167
if: steps.create-sysroot.outcome != 'success' && steps.get-cached-sysroot.outputs.cache-hit != 'true'
168168

169+
# SapMachine 2025-06-11: reduce number of cds/jsa archives
169170
- name: 'Configure'
170171
run: >
171172
bash configure
@@ -181,6 +182,7 @@ jobs:
181182
--with-jmod-compress=zip-1
182183
--with-external-symbols-in-bundles=none
183184
--with-native-debug-symbols-level=1
185+
--with-vendor-name="SAP SE"
184186
CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
185187
CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
186188
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (

‎.github/workflows/build-gh-pages.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# Workflow for building the sapmachine.io site and deploying it to GitHub Pages
2+
name: Build and deploy sapmachine.io page
3+
4+
on:
5+
# Allows to run this workflow manually from the Actions tab
6+
workflow_dispatch:
7+
inputs:
8+
event_type:
9+
description: 'Event type'
10+
required: false
11+
default: 'gh-page-build'
12+
13+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
14+
permissions:
15+
contents: read
16+
pages: write
17+
id-token: write
18+
19+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
20+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
21+
concurrency:
22+
group: "pages"
23+
cancel-in-progress: false
24+
25+
jobs:
26+
# Build job
27+
build:
28+
runs-on: ubuntu-latest
29+
steps:
30+
- name: Checkout repo from GitHub Tools SAP
31+
uses: actions/checkout@v5
32+
with:
33+
repository: SapMachine/SapMachineIOPage
34+
token: ${{ secrets.GHE_PAT }}
35+
github-server-url: https://github.tools.sap
36+
ref: 'main'
37+
sparse-checkout: |
38+
redirect_index.html
39+
redirect_404.html
40+
assets/
41+
jfrevents/
42+
html-include/
43+
sparse-checkout-cone-mode: true
44+
- name: Prepare site folder
45+
run: |
46+
mkdir site
47+
mv redirect_index.html site/index.html
48+
mv redirect_404.html site/404.html
49+
mv assets site/
50+
mv jfrevents site/
51+
mv html-include site/
52+
- name: Setup Pages
53+
uses: actions/configure-pages@v5
54+
- name: Upload artifact
55+
uses: actions/upload-pages-artifact@v3
56+
with:
57+
path: site
58+
59+
# Deployment job
60+
deploy:
61+
environment:
62+
name: github-pages
63+
url: ${{ steps.deployment.outputs.page_url }}
64+
runs-on: ubuntu-latest
65+
needs: build
66+
steps:
67+
- name: Deploy to GitHub Pages
68+
id: deployment
69+
uses: actions/deploy-pages@v4

‎.github/workflows/build-linux.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ jobs:
132132
${{ inputs.apt-extra-packages }}
133133
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
134134
135+
# SapMachine 2025-06-11: reduce number of cds/jsa archives
135136
- name: 'Configure'
136137
run: >
137138
bash configure
@@ -145,6 +146,7 @@ jobs:
145146
--with-jmod-compress=zip-1
146147
--with-external-symbols-in-bundles=none
147148
--with-native-debug-symbols-level=1
149+
--with-vendor-name="SAP SE"
148150
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
149151
echo "Dumping config.log:" &&
150152
cat config.log &&

‎.github/workflows/build-macos.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ jobs:
9999
# This will make GNU make available as 'make' and not only as 'gmake'
100100
echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
101101
102+
# SapMachine 2025-06-11: reduce number of cds/jsa archives
102103
- name: 'Configure'
103104
run: >
104105
bash configure
@@ -112,6 +113,7 @@ jobs:
112113
--with-jmod-compress=zip-1
113114
--with-external-symbols-in-bundles=none
114115
--with-native-debug-symbols-level=1
116+
--with-vendor-name="SAP SE"
115117
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
116118
echo "Dumping config.log:" &&
117119
cat config.log &&

‎.github/workflows/build-windows.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ jobs:
123123
--add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
124124
if: steps.toolchain-check.outputs.toolchain-installed != 'true'
125125

126+
# SapMachine 2025-06-11: reduce number of cds/jsa archives
126127
- name: 'Configure'
127128
run: >
128129
bash configure
@@ -135,6 +136,7 @@ jobs:
135136
--with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
136137
--with-jmod-compress=zip-1
137138
--with-external-symbols-in-bundles=none
139+
--with-vendor-name="SAP SE"
138140
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
139141
echo "Dumping config.log:" &&
140142
cat config.log &&

‎.github/workflows/main.yml‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,20 @@
2323
# questions.
2424
#
2525

26-
name: 'OpenJDK GHA Sanity Checks'
26+
# SapMachine 2022-06-22: Change the name of the GitHub Action
27+
name: 'SapMachine GHA Sanity Checks'
2728

2829
on:
2930
push:
3031
branches-ignore:
3132
- pr/*
33+
paths-ignore:
34+
- '**/*.md'
35+
- 'doc/**'
36+
# SapMachine 2020-11-04: Trigger on pull request
37+
pull_request:
38+
branches:
39+
- sapmachine
3240
workflow_dispatch:
3341
inputs:
3442
platforms:
@@ -57,6 +65,8 @@ jobs:
5765

5866
prepare:
5967
name: 'Prepare the run'
68+
# SapMachine 2022-06-23: On 'pull_request' we only want to run GHA if the PR comes from a remote repo. Otherwise we have the run on 'push' already as a check.
69+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name }}
6070
runs-on: ubuntu-24.04
6171
env:
6272
# List of platforms to exclude by default
@@ -102,7 +112,8 @@ jobs:
102112
function check_platform() {
103113
if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
104114
input='${{ github.event.inputs.platforms }}'
105-
elif [[ $GITHUB_EVENT_NAME == push ]]; then
115+
# SapMachine 2022-06-24: Also handle 'pull_request' event.
116+
elif [[ $GITHUB_EVENT_NAME == push ]] || [[ $GITHUB_EVENT_NAME == pull_request ]]; then
106117
if [[ '${{ !secrets.JDK_SUBMIT_FILTER || startsWith(github.ref, 'refs/heads/submit/') }}' == 'false' ]]; then
107118
# If JDK_SUBMIT_FILTER is set, and this is not a "submit/" branch, don't run anything
108119
>&2 echo 'JDK_SUBMIT_FILTER is set and not a "submit/" branch'
@@ -164,11 +175,23 @@ jobs:
164175
return
165176
fi
166177
178+
# SapMachine 2025-07-14: Add sapmachine branch
179+
if [[ $BRANCH == "sapmachine" ]]; then
180+
echo 'true'
181+
return
182+
fi
183+
167184
# ...same for stabilization branches
168185
if [[ $BRANCH =~ "jdk(.*)" ]]; then
169186
echo 'true'
170187
return
171188
fi
189+
190+
# SapMachine 2025-07-14: Add sapmachine* branches
191+
if [[ $BRANCH =~ "sapmachine([0-9]+)" ]]; then
192+
echo 'true'
193+
return
194+
fi
172195
fi
173196
174197
echo 'false'

‎.github/workflows/wiki.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Runs update-wiki action every day at 20:00 UTC
2+
3+
name: 'Wiki Update'
4+
5+
on:
6+
workflow_dispatch:
7+
schedule:
8+
- cron: '0 20 * * *'
9+
10+
jobs:
11+
wiki:
12+
if: ${{ github.event_name != 'schedule' || github.repository == 'SAP/SapMachine' }}
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout SapMachine Wiki source
16+
uses: actions/checkout@v4
17+
with:
18+
repository: 'SAP/SapMachine.wiki.git'
19+
ref: 'master'
20+
- name: Configure git
21+
run: |
22+
git config user.name "SapMachine Github Actions Bot"
23+
git config user.email "sapmachine@sap.com"
24+
git remote set-url origin https://github.com/SAP/SapMachine.wiki.git
25+
- name: Update Wiki
26+
run: |
27+
pip3 install feedparser
28+
python3 scripts/update_blogs.py update
29+
git commit -a -m "Update blogs" || echo "No updates"
30+
- name: Push changes
31+
run: git push origin master
32+
working-directory: .
33+
shell: bash

0 commit comments

Comments
 (0)