Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix casing "macOS" and "JabRef", vendor: JabRef e.V. #10356

Merged
merged 1 commit into from
Sep 12, 2023
Merged

Fix casing "macOS" and "JabRef", vendor: JabRef e.V. #10356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/deployment-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ jobs:
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.10.2
- name: Set up JDK
- name: Setup JDK
uses: actions/setup-java@v3
with:
java-version: 20
distribution: 'temurin'
cache: 'gradle'
- name: setup jdk JabRef-fix mac
- name: Setup JDK jabref-fix macOS
shell: bash
run: |
mkdir ${{runner.temp}}/jdk
Expand All @@ -81,7 +81,7 @@ jobs:
- name: Clean up keychain
run: |
security delete-keychain signing_temp.keychain ${{runner.temp}}/keychain/notarization.keychain || true
- name: Setup OSX key chain on OSX
- name: Setup OSX key chain on macOS
uses: apple-actions/import-codesign-certs@v2
with:
p12-file-base64: ${{ secrets.OSX_SIGNING_CERT }}
Expand All @@ -99,9 +99,9 @@ jobs:
mkdir ${{runner.temp}}/keychain
security create-keychain -p jabref ${{runner.temp}}/keychain/notarization.keychain
security set-keychain-settings ${{runner.temp}}/keychain/notarization.keychain
- name: Prepare merged jars and modules dir (macos)
- name: Prepare merged jars and modules dir (macOS)
run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir
- name: Build dmg (macos)
- name: Build dmg (macOS)
shell: bash
run: |
${{env.JDK21}}/Contents/Home/bin/jpackage \
Expand All @@ -113,8 +113,8 @@ jobs:
--app-version ${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }} \
--verbose \
--mac-sign \
--vendor JabRef \
--mac-package-identifier Jabref \
--vendor "JabRef e.V." \
--mac-package-identifier JabRef \
--mac-package-name JabRef \
--type dmg --mac-signing-key-user-name "JabRef e.V. (6792V39SK3)" \
--mac-package-signing-prefix org.jabref \
Expand All @@ -123,7 +123,7 @@ jobs:
--resource-dir buildres/mac \
--file-associations buildres/mac/bibtexAssociations.properties \
--jlink-options --bind-services
- name: Build pkg (macos)
- name: Build pkg (macOS)
shell: bash
run: |
${{env.JDK21}}/Contents/Home/bin/jpackage \
Expand All @@ -135,8 +135,8 @@ jobs:
--app-version ${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }} \
--verbose \
--mac-sign \
--vendor JabRef \
--mac-package-identifier Jabref \
--vendor "JabRef e.V." \
--mac-package-identifier JabRef \
--mac-package-name JabRef \
--type pkg --mac-signing-key-user-name "JabRef e.V. (6792V39SK3)" \
--mac-package-signing-prefix org.jabref \
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,13 @@ jobs:
- name: Run GitVersion
id: gitversion
uses: gittools/actions/gitversion/execute@v0.10.2
- name: Set up JDK
- name: Setup JDK
uses: actions/setup-java@v3
with:
java-version: 20
distribution: 'temurin'
cache: 'gradle'
- name: setup jdk JabRef-fix (windows)
- name: Setup JDK jabref-fix (Windows)
if: (matrix.os == 'windows-latest')
shell: bash
run: |
Expand All @@ -105,7 +105,7 @@ jobs:
cat gradle.properties

sed -i "s/JavaLanguageVersion.of(20)/JavaLanguageVersion.of(21)/" build.gradle
- name: setup jdk JabRef-fix (ubuntu)
- name: Setup JDK jabref-fix (ubuntu)
if: (matrix.os == 'ubuntu-latest')
shell: bash
run: |
Expand All @@ -119,7 +119,7 @@ jobs:
cat gradle.properties

sed -i "s/JavaLanguageVersion.of(20)/JavaLanguageVersion.of(21)/" build.gradle
- name: setup jdk JabRef-fix (macos)
- name: Setup JDK jabref-fix (macOS)
if: (matrix.os == 'macos-latest')
shell: bash
run: |
Expand All @@ -134,22 +134,22 @@ jobs:
cat gradle.properties

sed -i'.bak' -e "s/JavaLanguageVersion.of(20)/JavaLanguageVersion.of(21)/" build.gradle
- name: Setup OSX key chain (macos)
- name: Setup OSX key chain (macOS)
if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
uses: apple-actions/import-codesign-certs@v2
with:
p12-file-base64: ${{ secrets.OSX_SIGNING_CERT }}
p12-password: ${{ secrets.OSX_CERT_PWD }}
keychain-password: jabref
- name: Setup OSX key chain on OSX for app id cert (macos)
- name: Setup OSX key chain on OSX for app id cert (macOS)
if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
uses: apple-actions/import-codesign-certs@v2
with:
p12-file-base64: ${{ secrets.OSX_SIGNING_CERT_APPLICATION }}
p12-password: ${{ secrets.OSX_CERT_PWD }}
create-keychain: false
keychain-password: jabref
- name: Build runtime image (non-macos)
- name: Build runtime image (non-macOS)
if: (matrix.os != 'macos-latest')
run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jlinkZip
- name: Prepare merged jars and modules dir (macos)
Expand All @@ -159,7 +159,7 @@ jobs:
if: (matrix.os != 'macos-latest')
shell: bash
run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
- name: Build dmg (macos)
- name: Build dmg (macOS)
if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
shell: bash
run: |
Expand All @@ -172,8 +172,8 @@ jobs:
--app-version ${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }} \
--verbose \
--mac-sign \
--vendor JabRef \
--mac-package-identifier Jabref \
--vendor "JabRef e.V." \
--mac-package-identifier JabRef \
--mac-package-name JabRef \
--type dmg --mac-signing-key-user-name "JabRef e.V. (6792V39SK3)" \
--mac-package-signing-prefix org.jabref \
Expand All @@ -182,7 +182,7 @@ jobs:
--resource-dir buildres/mac \
--file-associations buildres/mac/bibtexAssociations.properties \
--jlink-options --bind-services
- name: Build pkg (macos)
- name: Build pkg (macOS)
if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
shell: bash
run: |
Expand All @@ -195,8 +195,8 @@ jobs:
--app-version ${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }} \
--verbose \
--mac-sign \
--vendor JabRef \
--mac-package-identifier Jabref \
--vendor "JabRef e.V." \
--mac-package-identifier JabRef \
--mac-package-name JabRef \
--type pkg --mac-signing-key-user-name "JabRef e.V. (6792V39SK3)" \
--mac-package-signing-prefix org.jabref \
Expand All @@ -205,7 +205,7 @@ jobs:
--resource-dir buildres/mac \
--file-associations buildres/mac/bibtexAssociations.properties \
--jlink-options --bind-services
- name: Package application image (non-macos)
- name: Package application image (non-macOS)
if: (matrix.os != 'macos-latest')
shell: bash
run: ${{ matrix.archivePortable }}
Expand Down Expand Up @@ -237,21 +237,21 @@ jobs:
ssh_options: '-p 9922'
src: 'build/distribution/'
dest: jrrsync@build-upload.jabref.org:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/
- name: Upload to GitHub workflow artifacts store (windows)
- name: Upload to GitHub workflow artifacts store (Windows)
if: (matrix.os == 'windows-latest') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
uses: actions/upload-artifact@v3
with:
name: JabRef-${{ matrix.displayName }}
path: build/distribution
- name: Upload to GitHub workflow artifacts store (macos)
- name: Upload to GitHub workflow artifacts store (macOS)
if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES') && (!startsWith(github.ref, 'refs/heads/gh-readonly-queue'))
uses: actions/upload-artifact@v3
with:
# tbn = to-be-notarized
name: JabRef-macOS-tbn
path: build/distribution
notarize: # outsourced in a separate job to be able to rerun if this fails for timeouts
name: Notarize and package Mac OS binaries
name: Notarize and package macOS binaries
runs-on: macos-latest
needs: [build]
if: ${{ !startsWith(github.ref, 'refs/heads/gh-readonly-queue') }}
Expand Down Expand Up @@ -348,7 +348,7 @@ jobs:
if: steps.checksecrets.outputs.secretspresent == 'YES'
id: gitversion
uses: gittools/actions/gitversion/execute@v0.10.2
- name: Get windows binaries
- name: Get Windows binaries
if: steps.checksecrets.outputs.secretspresent == 'YES'
uses: actions/download-artifact@master
with:
Expand Down