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.

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

Snap GitHub ci #5379

Merged
merged 31 commits into from
Oct 7, 2019
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
98aa0ad
Build snap from java package
LyzardKing Oct 1, 2019
9f0da25
add snap to github ci
LyzardKing Oct 2, 2019
f500da2
Use docker snapcraft
LyzardKing Oct 2, 2019
c8f7e1b
Add container to ubuntu matrix item
LyzardKing Oct 2, 2019
6dfe477
move snap workflow to matrix
LyzardKing Oct 2, 2019
2af1721
add matrix to snapbuild
LyzardKing Oct 2, 2019
90439f7
add transfer.sh link
LyzardKing Oct 2, 2019
208539c
Use tar from build/distribution
LyzardKing Oct 2, 2019
8ad8125
Add stable snapcraft
LyzardKing Oct 2, 2019
7deadac
Remove explicit container
LyzardKing Oct 2, 2019
1fd8738
Attempt at a github actions integration
LyzardKing Oct 2, 2019
8eb36dc
Try to make it work...
tobiasdiez Oct 2, 2019
45e25c3
Try to fix ?
tobiasdiez Oct 2, 2019
2b161e0
Merge remote-tracking branch 'upstream/master' into snapGithubCI
LyzardKing Oct 3, 2019
7af1e48
Build without docker
LyzardKing Oct 3, 2019
fa2deba
Build with latest docker
LyzardKing Oct 3, 2019
49e9b11
Add docker image based on bionic
LyzardKing Oct 3, 2019
93211a4
Temporarily revert to version-script
LyzardKing Oct 3, 2019
37d86b1
Uncomment upload to builds.jabref
LyzardKing Oct 3, 2019
e274aca
Make sure to move only jabref snap to build folder
LyzardKing Oct 3, 2019
17b2c30
Update and rename deployment.yml to snap-deployment.yml
Siedlerchr Oct 7, 2019
9ab74db
Update and rename snap-deployment.yml to deployment.yml
tobiasdiez Oct 7, 2019
60112f4
Reenable checks for PRs
tobiasdiez Oct 7, 2019
801dbaf
Temporarily disable master branch check to test
tobiasdiez Oct 7, 2019
b4a27a5
I'm tired...
tobiasdiez Oct 7, 2019
abe96f3
Fix branch name detection for PRs
tobiasdiez Oct 7, 2019
7d951c0
Try to fix branch name detection
tobiasdiez Oct 7, 2019
c711a15
Merge branch 'master' into snapGithubCI
tobiasdiez Oct 7, 2019
c4f3f03
Update deployment.yml
tobiasdiez Oct 7, 2019
ba95997
Update deployment.yml
tobiasdiez Oct 7, 2019
c8f1ae3
Remove on PR
tobiasdiez Oct 7, 2019
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deployment
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you changed that?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I confused it, I though it's a separate file.

name: Snap-Deployment

on: [push]

Expand Down Expand Up @@ -78,6 +78,14 @@ jobs:
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
id: extract_branch
- name: Build and publish snap
if: matrix.os == 'ubuntu-latest'
env:
SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }}
run: |
docker run -v $(pwd):$(pwd) -t lyzardking/snapcraft-bionic sh -c "apt update -qq && cd $(pwd) && snapcraft && mv jabref*.snap build/distribution/"
# cd build/distribution/ && mdkir .snapcraft && echo ${SNAPCRAFT_LOGIN_FILE} | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg && snapcraft push --release=beta *.snap
shell: bash
- name: Upload to builds.jabref.org
uses: garygrossgarten/github-action-scp@release
with:
Expand Down
301 changes: 0 additions & 301 deletions snap/plugins/x_gradle.py

This file was deleted.

51 changes: 11 additions & 40 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
name: jabref
version: "git"
# adopt-info: jabref
version: 'master'
version-script: cat build.gradle | grep "^version =" | cut -d'"' -f2
#icon: snap/gui/jabref.png
icon: snap/gui/jabref.png
license: MIT
summary: Bibliography manager
description: JabRef is an open source bibliography reference manager. The native file format used by JabRef is BibTeX, the standard LaTeX bibliography format.

Expand All @@ -14,11 +16,10 @@ architectures:

apps:
jabref:
command: desktop-launch $SNAP/jabref/bin/JabRefMain
command: bin/JabRef
extensions: [gnome-3-28]
environment:
_JAVA_OPTIONS: "-Duser.home=$SNAP_USER_DATA"
XDG_DATA_DIRS: $SNAP/share:$XDG_DATA_DIRS
GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
plugs:
- desktop
- desktop-legacy
Expand All @@ -28,43 +29,13 @@ apps:
- opengl
- network-bind
- removable-media
- gnome-3-28-1804

plugs:
gnome-3-28-1804:
interface: content
target: gnome-platform
default-provider: gnome-3-28-1804:gnome-3-28-1804
content: gnome-3-28-1804
gtk-3-themes:
interface: content
target: $SNAP/data-dir/themes
default-provider: gtk-common-themes:gtk-3-themes
icon-themes:
interface: content
target: $SNAP/data-dir/icons
default-provider: gtk-common-themes:icon-themes


parts:
jabref:
plugin: x_gradle
source: .
source-type: git
plugin: dump
source: build/distribution/JabRef-portable_linux.tar.gz
# override-pull: |
# snapcraftctl pull
# snapcraftctl set-version "$(cat app/JabRef.cfg | grep "app.version=" | cut -d'=' -f2)"
stage-packages:
- openjdk-11-jre
- openjfx
- x11-utils
gradle-options: [jlink, -xtest]
gradle-output-dir: 'build/image'
desktop-gnome-platform:
source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
source-subdir: gtk
plugin: make
make-parameters: ["FLAVOR=gtk3"]
build-packages:
- build-essential
- libgtk-3-dev
override-build: |
snapcraftctl build
mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform