-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master'
* upstream/master: Move snap publishing to own workflow Squashed 'src/main/resources/csl-locales/' changes from 2b94bf9fac..d0ee4d13c9 Remove obsolete step Add debug output for snap file location Try to build snapcraft image also on master-release Build snap only for master branch Update GitVersion action from v0.3 to v0.9.1 (#6061) Add empty line to deployment.yml to trigger build Release v5.0 Refine external-libraries.txt Revert "Remove ci prefix for releases" Remove suffix "-ci.1" from version information stored in BuildInfo Remove ci prefix for releases Use github action to publish snap
- Loading branch information
Showing
8 changed files
with
170 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,24 +43,16 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Checkout source | ||
| uses: actions/checkout@v2-beta | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Fetch tags and master for GitVersion | ||
| run: | | ||
| git fetch --tags origin | ||
| git rev-parse --verify master | ||
| if (-not $?) { | ||
| git branch --force --create-reflog master origin/master | ||
| } | ||
| shell: pwsh | ||
| uses: actions/checkout@v2 | ||
| - name: Fetch all history for all tags and branches | ||
| run: git fetch --prune --unshallow | ||
| - name: Install GitVersion | ||
| uses: gittools/actions/setup-gitversion@v0.3 | ||
| uses: gittools/actions/gitversion/setup@v0.9.1 | ||
| with: | ||
| versionSpec: '5.1.2' | ||
| versionSpec: '5.1.3' | ||
| - name: Run GitVersion | ||
| id: gitversion | ||
| uses: gittools/actions/execute-gitversion@v0.3 | ||
| uses: gittools/actions/gitversion/execute@v0.9.1 | ||
| - name: Set up JDK | ||
| uses: actions/setup-java@v1 | ||
| with: | ||
|
|
@@ -111,25 +103,6 @@ jobs: | |
| export BADASS_JLINK_JPACKAGE_HOME="${GITHUB_WORKSPACE}${{ matrix.jdk14Path }}" | ||
| ./gradlew -PprojVersion="${{ steps.gitversion.outputs.AssemblySemVer }}" -PprojVersionInfo="${{ steps.gitversion.outputs.InformationalVersion }}" jpackage | ||
| shell: bash | ||
| - name: Package application image | ||
| run: ${{ matrix.archivePortable }} | ||
| shell: bash | ||
| - name: Build snap (1) Setup snapcraft | ||
| uses: jhenstridge/snapcraft-build-action@v1 | ||
| id: snapcraft | ||
| if: matrix.displayName == 'linux' | ||
| - name: Build snap (2) Run build | ||
| run: | | ||
| mv ${{ steps.snapcraft.outputs.snap }} build/distribution/ | ||
| if: matrix.displayName == 'linux' | ||
| - name: Build snap (3) Upload snap | ||
| if: matrix.displayName == 'linux' && github.ref == 'refs/heads/master' | ||
| env: | ||
| SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }} | ||
| run: | | ||
| mkdir .snapcraft && echo ${SNAPCRAFT_LOGIN_FILE} | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg | ||
| snapcraft push build/distribution/jabref*.snap --release edge || true | ||
| shell: bash | ||
| - name: Rename files | ||
| run: | | ||
| get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"} | ||
|
|
@@ -146,24 +119,16 @@ jobs: | |
| needs: [build] | ||
| steps: | ||
| - name: Checkout source | ||
| uses: actions/checkout@v2-beta | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Fetch tags and master for GitVersion | ||
| run: | | ||
| git fetch --tags origin | ||
| git rev-parse --verify master | ||
| if (-not $?) { | ||
| git branch --force --create-reflog master origin/master | ||
| } | ||
| shell: pwsh | ||
| uses: actions/checkout@v2 | ||
| - name: Fetch all history for all tags and branches | ||
| run: git fetch --prune --unshallow | ||
| - name: Install GitVersion | ||
| uses: gittools/actions/setup-gitversion@v0.3 | ||
| uses: gittools/actions/gitversion/setup@v0.9.1 | ||
| with: | ||
| versionSpec: '5.1.2' | ||
| versionSpec: '5.1.3' | ||
| - name: Run GitVersion | ||
| id: gitversion | ||
| uses: gittools/actions/execute-gitversion@v0.3 | ||
| uses: gittools/actions/gitversion/execute@v0.9.1 | ||
| - name: Get linux binaries | ||
| uses: actions/download-artifact@master | ||
| with: | ||
|
|
@@ -191,3 +156,4 @@ jobs: | |
| ssh_options: '-p 9922' | ||
| src: 'build/distribution/' | ||
| dest: [email protected]:/var/www/builds.jabref.org/www/${{ steps.gitversion.outputs.branchName }}/ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| name: Snap | ||
|
|
||
| on: | ||
| schedule: | ||
| # run on each day | ||
| - cron: '33 4 * * *' | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| name: Create snapcraft image | ||
|
|
||
| steps: | ||
| - name: Checkout source | ||
| uses: actions/checkout@v2 | ||
| # The image relies on https://builds.jabref.org/master/JabRef-5.0-portable_linux.tar.gz^ | ||
| # See snap/snapcraft.yml for details | ||
| - name: Build snap (1) Run build | ||
| uses: jhenstridge/snapcraft-build-action@v1 | ||
| id: snapcraft | ||
| - name: Build snap (2) Upload snap | ||
| uses: jhenstridge/snapcraft-publish-action@v1 | ||
| with: | ||
| store_login: ${{ secrets.SNAPCRAFT_LOGIN_FILE }} | ||
| snap: ${{ steps.snapcraft.outputs.snap }} | ||
| release: edge |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters