Skip to content

Commit 7c2662e

Browse files
snake66snake66
committed
Merge remote-tracking branch 'battleblow-jdk25u/bsd-port' into jdk25u-freebsd-1
2 parents 1313573 + d94e5fc commit 7c2662e

File tree

772 files changed

+17484
-10329
lines changed

Some content is hidden

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

772 files changed

+17484
-10329
lines changed

‎.github/actions/build-jtreg/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ runs:
6565
with:
6666
name: bundles-jtreg-${{ steps.version.outputs.value }}
6767
path: jtreg/installed
68-
retention-days: 1
68+
retention-days: 5

‎.github/actions/do-build-vm/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ runs:
5353
- name: 'Copy back files from VM'
5454
shell: bash
5555
run: >
56-
bash $VM_SCRIPT_DIR/run.sh rsyncBackFromVM
56+
rsync -av --exclude .git -e ssh ${{ inputs.vm-name }}:${{ github.workspace }}/ ${{ github.workspace }}/
5757
5858
- name: 'Check for failure'
5959
id: check

‎.github/actions/get-msys2/action.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ runs:
3030
using: composite
3131
steps:
3232
- name: 'Install MSYS2'
33-
uses: msys2/setup-msys2@v2.22.0
33+
id: msys2
34+
uses: msys2/setup-msys2@v2.28.0
3435
with:
3536
install: 'autoconf tar unzip zip make'
3637
path-type: minimal
37-
location: ${{ runner.tool_cache }}/msys2
38+
release: false
3839

3940
# We can't run bash until this is completed, so stick with pwsh
4041
- name: 'Set MSYS2 path'
4142
run: |
42-
# Prepend msys2/msys64/usr/bin to the PATH
43-
echo "$env:RUNNER_TOOL_CACHE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
43+
echo "${{ steps.msys2.outputs.msys2-location }}/usr/bin" >> $env:GITHUB_PATH
4444
shell: pwsh

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,5 @@ runs:
9191
with:
9292
name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}${{ inputs.bundle-suffix }}
9393
path: bundles
94-
retention-days: 1
94+
retention-days: 5
9595
if: steps.bundles.outputs.bundles-found == 'true'

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ on:
5151
make-arguments:
5252
required: false
5353
type: string
54+
dry-run:
55+
required: false
56+
type: boolean
57+
default: false
5458

5559
jobs:
5660
build-linux:
@@ -104,9 +108,11 @@ jobs:
104108
make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
105109
platform: ${{ inputs.platform }}
106110
debug-suffix: '${{ matrix.suffix }}'
111+
if: ${{ inputs.dry-run == false }}
107112

108113
- name: 'Upload bundles'
109114
uses: ./.github/actions/upload-bundles
110115
with:
111116
platform: ${{ inputs.platform }}
112117
debug-suffix: '${{ matrix.suffix }}'
118+
if: ${{ inputs.dry-run == false }}

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ on:
4040
make-arguments:
4141
required: false
4242
type: string
43+
dry-run:
44+
required: false
45+
type: boolean
46+
default: false
4347

4448
jobs:
4549
build-cross-compile:
@@ -60,33 +64,33 @@ jobs:
6064
gnu-arch: aarch64
6165
debian-arch: arm64
6266
debian-repository: https://httpredir.debian.org/debian/
63-
debian-version: bullseye
67+
debian-version: trixie
6468
tolerate-sysroot-errors: false
6569
- target-cpu: arm
6670
gnu-arch: arm
6771
debian-arch: armhf
6872
debian-repository: https://httpredir.debian.org/debian/
69-
debian-version: bullseye
73+
debian-version: trixie
7074
tolerate-sysroot-errors: false
7175
gnu-abi: eabihf
7276
- target-cpu: s390x
7377
gnu-arch: s390x
7478
debian-arch: s390x
7579
debian-repository: https://httpredir.debian.org/debian/
76-
debian-version: bullseye
80+
debian-version: trixie
7781
tolerate-sysroot-errors: false
7882
- target-cpu: ppc64le
7983
gnu-arch: powerpc64le
8084
debian-arch: ppc64el
8185
debian-repository: https://httpredir.debian.org/debian/
82-
debian-version: bullseye
86+
debian-version: trixie
8387
tolerate-sysroot-errors: false
8488
- target-cpu: riscv64
8589
gnu-arch: riscv64
8690
debian-arch: riscv64
8791
debian-repository: https://httpredir.debian.org/debian/
88-
debian-version: sid
89-
tolerate-sysroot-errors: true
92+
debian-version: trixie
93+
tolerate-sysroot-errors: false
9094

9195
steps:
9296
- name: 'Checkout the JDK source'
@@ -189,4 +193,4 @@ jobs:
189193
with:
190194
make-target: 'hotspot ${{ inputs.make-arguments }}'
191195
platform: linux-${{ matrix.target-cpu }}
192-
if: steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true'
196+
if: ((steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true') && inputs.dry-run == false)

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565

6666
env:
6767
MYTOKEN : ${{ secrets.MYTOKEN }}
68-
VM_SCRIPT_DIR : ${{ github.workspace }}/../../_actions/vmactions/freebsd-vm/v1
6968

7069
strategy:
7170
fail-fast: false
@@ -77,6 +76,17 @@ jobs:
7776
suffix: -debug
7877

7978
steps:
79+
- name: Setup Host for VM
80+
run: |
81+
echo "Starting storage:"
82+
sudo df -h
83+
echo "Removing Android SDKs and Tools"
84+
sudo rm -rf /usr/local/lib/android
85+
echo "Reduce swappiness"
86+
sudo sysctl vm.swappiness=10
87+
echo "Available storage:"
88+
sudo df -h
89+
8090
- name: 'Checkout the JDK source'
8191
uses: actions/checkout@v4
8292

@@ -97,7 +107,7 @@ jobs:
97107
with:
98108
release: ${{ inputs.vm-release }}
99109
arch: ${{ inputs.vm-arch }}
100-
mem: 12288
110+
mem: 11264
101111
cpu: 4
102112
envs: 'MYTOKEN'
103113
usesh: true
@@ -156,6 +166,14 @@ jobs:
156166
vm-name: 'freebsd'
157167
debug-suffix: '${{ matrix.suffix }}'
158168

169+
- name: 'Check Memory, Swap and Disk Usage'
170+
run: |
171+
echo "Memory and swap:"
172+
sudo free -h
173+
echo
174+
echo "Available storage:"
175+
sudo df -h
176+
159177
- name: 'Upload bundles'
160178
uses: ./.github/actions/upload-bundles
161179
with:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ on:
6161
make-arguments:
6262
required: false
6363
type: string
64+
dry-run:
65+
required: false
66+
type: boolean
67+
default: false
6468
bundle-suffix:
6569
required: false
6670
type: string
@@ -139,6 +143,7 @@ jobs:
139143
make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
140144
platform: ${{ inputs.platform }}
141145
debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
146+
if: ${{ inputs.dry-run == false }}
142147

143148
- name: 'Upload bundles'
144149
uses: ./.github/actions/upload-bundles
@@ -147,3 +152,4 @@ jobs:
147152
debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
148153
bundle-suffix: ${{ inputs.bundle-suffix }}
149154
static-suffix: ${{ inputs.static-suffix }}
155+
if: ${{ inputs.dry-run == false }}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ on:
5454
make-arguments:
5555
required: false
5656
type: string
57+
dry-run:
58+
required: false
59+
type: boolean
60+
default: false
5761

5862
jobs:
5963
build-macos:
@@ -118,9 +122,11 @@ jobs:
118122
make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
119123
platform: ${{ inputs.platform }}
120124
debug-suffix: '${{ matrix.suffix }}'
125+
if: ${{ inputs.dry-run == false }}
121126

122127
- name: 'Upload bundles'
123128
uses: ./.github/actions/upload-bundles
124129
with:
125130
platform: ${{ inputs.platform }}
126131
debug-suffix: '${{ matrix.suffix }}'
132+
if: ${{ inputs.dry-run == false }}

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

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565

6666
env:
6767
MYTOKEN : ${{ secrets.MYTOKEN }}
68-
VM_SCRIPT_DIR : ${{ github.workspace }}/../../_actions/vmactions/openbsd-vm/v1
6968

7069
strategy:
7170
fail-fast: false
@@ -77,6 +76,17 @@ jobs:
7776
suffix: -debug
7877

7978
steps:
79+
- name: Setup Host for VM
80+
run: |
81+
echo "Starting storage:"
82+
sudo df -h
83+
echo "Removing Android SDKs and Tools"
84+
sudo rm -rf /usr/local/lib/android
85+
echo "Reduce swappiness"
86+
sudo sysctl vm.swappiness=10
87+
echo "Available storage:"
88+
sudo df -h
89+
8090
- name: 'Checkout the JDK source'
8191
uses: actions/checkout@v4
8292

@@ -92,12 +102,19 @@ jobs:
92102
id: gtest
93103
uses: ./.github/actions/get-gtest
94104

105+
- name: 'Restore Cached VM Packages'
106+
id: vm-packages-cache
107+
uses: actions/cache/restore@v4
108+
with:
109+
path: obsd-pkg-cache
110+
key: packages-${{ inputs.platform }}-${{ inputs.vm-release }}-${{ inputs.vm-arch }}-${{ hashFiles('./obsd-pkg-cache/*.tgz') }}
111+
95112
- name: 'Start OpenBSD VM'
96113
uses: vmactions/openbsd-vm@v1
97114
with:
98115
release: ${{ inputs.vm-release }}
99116
arch: ${{ inputs.vm-arch }}
100-
mem: 12288
117+
mem: 11264
101118
cpu: 4
102119
envs: 'MYTOKEN'
103120
usesh: true
@@ -110,6 +127,9 @@ jobs:
110127
- name: 'Install toolchain and dependencies in VM'
111128
shell: openbsd {0}
112129
run: |
130+
export PKG_CACHE=$GITHUB_WORKSPACE/obsd-pkg-cache
131+
mkdir -p ${PKG_CACHE}
132+
export PKG_PATH="${PKG_CACHE}:https://cdn.openbsd.org/%m"
113133
until pkg_add jdk%25 metaauto autoconf%2.69 gtar-- zip unzip-- cups-libs bash ggrep gmake dwz libiconv harfbuzz jpeg lcms2 png giflib; do
114134
echo Retrying in 10 seconds; sleep 10;
115135
done
@@ -155,6 +175,21 @@ jobs:
155175
vm-name: 'openbsd'
156176
debug-suffix: '${{ matrix.suffix }}'
157177

178+
- name: 'Check Memory, Swap and Disk Usage'
179+
run: |
180+
echo "Memory and swap:"
181+
sudo free -h
182+
echo
183+
echo "Available storage:"
184+
sudo df -h
185+
186+
- name: 'Save VM Packages'
187+
uses: actions/cache/save@v4
188+
with:
189+
path: obsd-pkg-cache
190+
key: packages-${{ inputs.platform }}-${{ inputs.vm-release }}-${{ inputs.vm-arch }}-${{ hashFiles('./obsd-pkg-cache/*.tgz') }}
191+
if: ${{ matrix.debug-level == 'release' }}
192+
158193
- name: 'Upload bundles'
159194
uses: ./.github/actions/upload-bundles
160195
with:

0 commit comments

Comments
 (0)