Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into fixlookupfulltext
Browse files Browse the repository at this point in the history
# By Tobias Diez (109) and others
# Via GitHub (109) and others
* upstream/master: (404 commits)
  set jabrefHost.py executable (#5530)
  Add CHANGELOG entry for #5482
  Fix text colour in Merge dialogue (#5521)
  Remove empty customization warning
  Fix typos in external-libraries.txt file
  Fix new entry serialization test
  Add test for alphabetic serialization of fields in BibEntry
  Fix XMP null error
  Bring back the scrollbars (#5515)
  Fix metadata serialization order (#5514)
  New ADS Fetcher (#5501)
  snap: Add browser proxy for confined browser integration (#5512)
  Fix dark theme loading
  Update PreviewViewer.java
  [WIP] Try to fix dark theme path
  Use Platform.runLater
  Fixes #5485
  Bump com.github.ben-manes.versions from 0.26.0 to 0.27.0
  Bump src/main/resources/csl-styles from `68a697b` to `c3fd4bd`
  Bump byte-buddy-parent from 1.10.1 to 1.10.2
  ...

# Conflicts:
#	src/main/resources/l10n/JabRef_en.properties
  • Loading branch information
Siedlerchr committed Oct 27, 2019
2 parents 4f079a3 + 932e69f commit a0965dc
Show file tree
Hide file tree
Showing 382 changed files with 11,877 additions and 7,624 deletions.
85 changes: 0 additions & 85 deletions .circleci/config.yml

This file was deleted.

23 changes: 23 additions & 0 deletions .dependabot/config.yml
@@ -0,0 +1,23 @@
# Configuration for https://dependabot.com
version: 1

update_configs:
- package_manager: "java:gradle"
directory: "/"
update_schedule: "weekly"
default_labels:
- "dependencies"
automerged_updates:
- match:
dependency_type: "all"
update_type: "semver:minor"

- package_manager: "submodules"
directory: "/"
update_schedule: "weekly"
default_labels:
- "dependencies"
automerged_updates:
- match:
dependency_type: "all"
update_type: "all"
102 changes: 102 additions & 0 deletions .github/workflows/deployment.yml
@@ -0,0 +1,102 @@
name: Deployment

on: [push]

jobs:
deploy:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
include:
- os: ubuntu-latest
displayName: linux
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_linux-x64_bin.tar.gz
jdk14Path: /jdk-14
archivePortable: tar -czf build/distribution/JabRef-portable_linux.tar.gz -C build/distribution JabRef && rm -R build/distribution/JabRef
- os: windows-latest
displayName: windows
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_windows-x64_bin.zip
jdk14Path: /jdk-14
archivePortable: 7z a -r build/distribution/JabRef-portable_windows.zip ./build/distribution/JabRef && rm -R build/distribution/JabRef
- os: macOS-latest
displayName: macOS
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-49_osx-x64_bin.tar.gz
jdk14Path: /jdk-14.jdk/Contents/Home
archivePortable: tar -czf build/distribution/JabRef-portable_macos.tar.gz -C build/distribution JabRef.app && rm -R build/distribution/JabRef.app

runs-on: ${{ matrix.os }}
name: Deploy on ${{ matrix.displayName }}

steps:
- name: Checkout source
uses: actions/checkout@v1
with:
depth: 1
submodules: true
- name: Extract branch name
shell: bash
run: |
ref=${GITHUB_REF#refs/heads/}
ref=${ref#refs/pull/}
ref=${ref%/merge}
echo "##[set-output name=branch;]${ref}"
id: extract_branch
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 12.0.2
- name: Download jpackage
# We need to download jpackage from https://jdk.java.net/jpackage/
run: |
import tarfile
import zipfile
import sys
if sys.version_info[0] >= 3:
from urllib.request import urlretrieve
else:
from urllib import urlretrieve
url = "${{ matrix.jpackageDownload }}"
tmpfile, headers = urlretrieve(url)
if (url.endswith("tar.gz")):
tar = tarfile.open(tmpfile)
tar.extractall()
tar.close()
elif (url.endswith("zip")):
zip = zipfile.ZipFile(tmpfile)
zip.extractall()
zip.close()
shell: python
- name: Build runtime image
run: ./gradlew -Pdev=true jlinkZip
- name: Build installer
run: |
export BADASS_JLINK_JPACKAGE_HOME="${GITHUB_WORKSPACE}${{ matrix.jdk14Path }}"
./gradlew -Pdev=true jpackage
shell: bash
- name: Add installer as artifact
uses: actions/upload-artifact@master
with:
name: JabRef-${{ matrix.displayName }}
path: build/distribution
- name: Package application image
run: ${{ matrix.archivePortable }}
shell: bash
- name: Build and publish snap
if: matrix.os == 'ubuntu-latest' && steps.extract_branch.outputs.branch == 'master'
env:
SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
run: |
mkdir .snapcraft && echo ${SNAPCRAFT_LOGIN_FILE} | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg
docker run -v $(pwd):$(pwd) -t lyzardking/snapcraft-bionic sh -c "apt update -qq && cd $(pwd) && snapcraft && mv jabref*.snap build/distribution/ && snapcraft push build/distribution/jabref*.snap --release edge || true"
shell: bash
- name: Upload to builds.jabref.org
uses: garygrossgarten/github-action-scp@release
with:
local: build/distribution
remote: www/${{ steps.extract_branch.outputs.branch }}
host: builds.jabref.org
username: builds_jabref_org
privateKey: ${{ secrets.buildJabRefPrivateKey }}
port: 9922

0 comments on commit a0965dc

Please sign in to comment.