Skip to content

Commit

Permalink
Merge branch 'master' into jmj/wix4_update
Browse files Browse the repository at this point in the history
  • Loading branch information
jmjaffe37 authored May 8, 2024
2 parents 6d8c0b3 + 8b47951 commit 9dd8b96
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cacert-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
services.gradle.org:443
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5

- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
cacerts: ${{ steps.cacerts.outputs.cacerts }}
steps:
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
fetch-depth: 0

Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5

- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5

- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
Expand Down Expand Up @@ -198,5 +198,5 @@ jobs:
if: github.event_name == 'pull_request' || github.repository_owner != 'adoptium'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
2 changes: 1 addition & 1 deletion .github/workflows/pgkbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: macos-latest
steps:

- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5

- name: Install dependencies
run: brew install --cask packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
name: wix
runs-on: windows-latest
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5

- name: Install wix toolset
run: dotnet tool install --global wix --version 5.0.0 --verbosity quiet
Expand Down
2 changes: 1 addition & 1 deletion linux/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ def jenkinsStepAlpine() {
// special handle: no label x86_64 only x64 for alpine agent
def apkLabel = "${ApkARCH}&&docker"

if ("${ApkARCH}" == 'x86_64') {
apkLabel = 'x64&&dockerBuild'
if ("${ApkARCH}" == 'x86_64') {
}
// reallocate jenkins agent per element in list
if (ApkARCH == 'x86_64' || ApkARCH == 'aarch64') {
Expand Down
2 changes: 1 addition & 1 deletion linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pkgver=21.0.3_p9
_pkgver=${pkgver/_p/_}
_pkgverplus=${pkgver/_p/+}
_pkgvername=${_pkgverplus/+/%2B}
pkgrel=0
pkgrel=1
pkgdesc="Eclipse Temurin 21"
provider_priority=21
url="https://adoptium.net"
Expand Down
2 changes: 1 addition & 1 deletion linux/jdk/alpine/src/main/packaging/temurin/22/APKBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pkgver=22.0.1_p8
_pkgver=${pkgver/_p/_}
_pkgverplus=${pkgver/_p/+}
_pkgvername=${_pkgverplus/+/%2B}
pkgrel=0
pkgrel=1
pkgdesc="Eclipse Temurin 22"
provider_priority=22
url="https://adoptium.net"
Expand Down
2 changes: 1 addition & 1 deletion linux/jre/alpine/src/main/packaging/temurin/21/APKBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pkgver=21.0.3_p9
_pkgver=${pkgver/_p/_}
_pkgverplus=${pkgver/_p/+}
_pkgvername=${_pkgverplus/+/%2B}
pkgrel=0
pkgrel=1
pkgdesc="Eclipse Temurin 21"
provider_priority=21
url="https://adoptium.net"
Expand Down
2 changes: 1 addition & 1 deletion linux/jre/alpine/src/main/packaging/temurin/22/APKBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pkgver=22.0.1_p8
_pkgver=${pkgver/_p/_}
_pkgverplus=${pkgver/_p/+}
_pkgvername=${_pkgverplus/+/%2B}
pkgrel=0
pkgrel=1
pkgdesc="Eclipse Temurin 22"
provider_priority=22
url="https://adoptium.net"
Expand Down
44 changes: 44 additions & 0 deletions pkgbuild/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
pipeline {
agent {
label 'mac&&xcode11.7'
}
options {
timeout(time: 1, unit: 'HOURS')
buildDiscarder(logRotator(numToKeepStr: '50', artifactNumToKeepStr: '20'))
copyArtifactPermission('*');
}
parameters {
string(name: 'UPSTREAM_JOB_NAME', description: 'e.g. build-scripts/openjdk11-pipeline')
string(name: 'UPSTREAM_JOB_NUMBER', description: 'e.g. 123')
string(name: 'CERTIFICATE', description: 'Certificate name to sign the installer')
string(name: 'FILTER', defaultValue: '**/OpenJDK*_mac_*.tar.gz', description: 'e.g. **/OpenJDK*_mac_*.tar.gz')
string(name: 'MAJOR_VERSION', description: 'e.g. 8')
string(name: 'FULL_VERSION', description: 'e.g 1.8.0_192 or 11+28')
}
// checkout git repo
stages {
stage('Checkout') {
steps {
step([$class: 'WsCleanup'])
checkout scm
}
}
stage('Copy Artifacts') {
steps {
copyArtifacts filter: '${FILTER}', fingerprintArtifacts: true, projectName: '${UPSTREAM_JOB_NAME}', selector: specific('${UPSTREAM_JOB_NUMBER}')
}
}
stage('Build Installer') {
steps {
sh '''
bash pkgbuild/create-installer-mac.sh
'''
}
}
stage('Archive Installer') {
steps {
archiveArtifacts artifacts: 'workspace/target/OpenJDK*.pkg', followSymlinks: true
}
}
}
}

0 comments on commit 9dd8b96

Please sign in to comment.