Skip to content

Commit b8a2087

Browse files
committed
Revert "Release v5.9 preparation - set "GitVersion" explicitely (#9529)"
This reverts commit f31bca9
1 parent a63bb99 commit b8a2087

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

.github/workflows/deployment-arm64.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches:
77
- arm64mac-release
8-
8+
99

1010
env:
1111
SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
@@ -49,14 +49,13 @@ jobs:
4949
uses: actions/checkout@v3
5050
with:
5151
fetch-depth: 0
52+
- name: Install GitVersion
53+
uses: gittools/actions/gitversion/[email protected]
54+
with:
55+
versionSpec: "5.x"
5256
- name: Run GitVersion
5357
id: gitversion
54-
shell: bash
55-
run: |
56-
echo "AssemblySemVer=5.9.60000" >> $GITHUB_OUTPUT
57-
echo "InformationalVersion=5.9--`git log -1 --pretty='format:%cd' --date=format:'%Y-%m-%d'`--`git log -1 --format=%h`" >> $GITHUB_OUTPUT
58-
echo "Major=5" >> $GITHUB_OUTPUT
59-
echo "Minor=9" >> $GITHUB_OUTPUT
58+
uses: gittools/actions/gitversion/[email protected]
6059
- name: Set up JDK
6160
uses: actions/setup-java@v3
6261
with:
@@ -66,7 +65,7 @@ jobs:
6665
- name: Clean up keychain
6766
if: (matrix.os == 'self-hosted') && (steps.checksecrets.outputs.secretspresent == 'YES')
6867
run: |
69-
security delete-keychain signing_temp.keychain
68+
security delete-keychain signing_temp.keychain
7069
- name: Setup OSX key chain on OSX
7170
if: (matrix.os == 'macos-latest' || matrix.os == 'self-hosted') && (steps.checksecrets.outputs.secretspresent == 'YES')
7271
uses: apple-actions/import-codesign-certs@v1
@@ -160,7 +159,7 @@ jobs:
160159
uses: actions/download-artifact@master
161160
with:
162161
name: JabRef-macOS (Arm64)
163-
path: build/distribution/
162+
path: build/distribution/
164163
- name: Deploy to builds.jabref.org
165164
id: deploy
166165
if: steps.checksecrets.outputs.secretspresent == 'YES'

.github/workflows/deployment.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
archivePortable: 7z a -r build/distribution/JabRef-portable_windows.zip ./build/distribution/JabRef && rm -R build/distribution/JabRef
4747
- os: macos-latest
4848
displayName: macOS
49+
archivePortable: brew install pigz && tar -c -C build/distribution JabRef.app | pigz --rsyncable > build/distribution/JabRef-portable_macos.tar.gz && rm -R build/distribution/JabRef.app
4950
runs-on: ${{ matrix.os }}
5051
name: Create installer and portable version for ${{ matrix.displayName }}
5152
steps:
@@ -64,14 +65,13 @@ jobs:
6465
uses: actions/checkout@v3
6566
with:
6667
fetch-depth: 0
68+
- name: Install GitVersion
69+
uses: gittools/actions/gitversion/[email protected]
70+
with:
71+
versionSpec: "5.x"
6772
- name: Run GitVersion
6873
id: gitversion
69-
shell: bash
70-
run: |
71-
echo "AssemblySemVer=5.9.6000" >> $GITHUB_OUTPUT
72-
echo "InformationalVersion=5.9--`git log -1 --pretty='format:%cd' --date=format:'%Y-%m-%d'`--`git log -1 --format=%h`" >> $GITHUB_OUTPUT
73-
echo "Major=5" >> $GITHUB_OUTPUT
74-
echo "Minor=9" >> $GITHUB_OUTPUT
74+
uses: gittools/actions/gitversion/[email protected]
7575
- name: Set up JDK
7676
uses: actions/setup-java@v3
7777
with:

0 commit comments

Comments
 (0)