Skip to content

Commit

Permalink
Fix more casing
Browse files Browse the repository at this point in the history
  • Loading branch information
koppor committed Sep 7, 2023
1 parent 528234e commit 3f09155
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/deployment-arm64.yml
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/[email protected]
- 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 @@ -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 Down
34 changes: 17 additions & 17 deletions .github/workflows/deployment.yml
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/[email protected]
- 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,32 +134,32 @@ 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: Build installer (non-macos)
if: (matrix.os != 'macos-latest')
shell: bash
run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage
- name: Prepare merged jars and modules dir (macos)
- name: Prepare merged jars and modules dir (macOS)
if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
run: ./gradlew -i -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" prepareModulesDir
- name: Build dmg (macos)
- name: Build dmg (macOS)
if: (matrix.os == 'macos-latest') && (steps.checksecrets.outputs.secretspresent == 'YES')
shell: bash
run: |
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 @@ -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: [email protected]:/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,19 +348,19 @@ jobs:
if: steps.checksecrets.outputs.secretspresent == 'YES'
id: gitversion
uses: gittools/actions/gitversion/[email protected]
- name: Get windows binaries
- name: Get Windows binaries
if: steps.checksecrets.outputs.secretspresent == 'YES'
uses: actions/download-artifact@master
with:
name: jabref-windows
path: build/distribution
- name: Get macos binaries unsigned
- name: Get macOS binaries unsigned
if: (steps.checksecrets.outputs.secretspresent == 'YES') && (inputs.notarization == false && !startsWith(github.ref, 'refs/tags/'))
uses: actions/download-artifact@master
with:
name: jabref-macos-tbn
path: build/distribution/
- name: Get macos binaries notarized
- name: Get macOS binaries notarized
if: (steps.checksecrets.outputs.secretspresent == 'YES') && (inputs.notarization == true || startsWith(github.ref, 'refs/tags/'))
uses: actions/download-artifact@master
with:
Expand Down

0 comments on commit 3f09155

Please sign in to comment.