Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
safirex authored Mar 23, 2021
2 parents 13eb009 + c5918ca commit 7f01f6d
Show file tree
Hide file tree
Showing 37 changed files with 701 additions and 586 deletions.
12 changes: 0 additions & 12 deletions .ci/build.bat

This file was deleted.

25 changes: 0 additions & 25 deletions .ci/build.sh

This file was deleted.

43 changes: 0 additions & 43 deletions .ci/linux.sh

This file was deleted.

23 changes: 0 additions & 23 deletions .ci/osx-add-key.sh

This file was deleted.

42 changes: 0 additions & 42 deletions .ci/osx.sh

This file was deleted.

42 changes: 0 additions & 42 deletions .ci/windows.bat

This file was deleted.

22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: 'Bug report'
about: 'Create a report to help us improve'
labels: 'bug'
---

<!--- Provide a brief summary of the issue -->

### Expected Behavior
<!--- Tell us what should happen -->

### Current Behavior
<!--- Tell us what happens instead of the expected behavior -->

### Steps to Reproduce
<!--- Steps to reproduce this bug -->

### Your Environment
<!--- Include as many relevant details about the environment you experienced the bug in -->

### Screenshots
<!--- If applicable, add screenshots to help explain the bug report -->
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: 'Feature request'
about: 'Suggest an idea for this project'
labels: 'enhancement'
---

<!--- Provide a brief summary of the feature -->

### Expected Behavior
<!--- Tell us how it should work -->

### Current Behavior
<!--- Explain the difference from current behavior -->

### Context
<!--- How has this issue affected you? What are you trying to accomplish? What other alternatives have you considered? -->
<!--- Providing context helps us come up with a solution that is most useful in the real world -->
12 changes: 12 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!--- Provide a brief summary of the PR -->

### Issue

<!--- The issue this PR addresses -->
Fixes #

### Progress

- [ ] Change must not contain extraneous whitespace
- [ ] License header year is updated, if required
- [ ] Verify the contributor has signed [Gluon Individual Contributor License Agreement (CLA)](https://docs.google.com/forms/d/16aoFTmzs8lZTfiyrEm8YgMqMYaGQl0J8wA0VJE2LCCY)
37 changes: 37 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: SceneBuilder Build
on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Install packages
run: |
sudo apt-get install xvfb tigervnc-standalone-server tigervnc-common
- name: Checkout
uses: actions/checkout@v2

- name: Setup Java 11
uses: actions/setup-java@v1
with:
java-version: 11

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build project
run: |
export DISPLAY=:90
mkdir /home/runner/.vnc
echo 123456 | vncpasswd -f > /home/runner/.vnc/passwd
chmod -v 600 /home/runner/.vnc/passwd
vncserver :90 -localhost -nolisten tcp
./gradlew -i build
vncserver -kill :90
54 changes: 54 additions & 0 deletions .github/workflows/kit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Scene Builder Kit
on:
push:
tags:
- '*'
jobs:
build:
runs-on: ubuntu-20.04
steps:
- name: Install packages
run: sudo apt-get install xdg-utils xvfb tigervnc-standalone-server tigervnc-common
- uses: actions/checkout@v2
- name: Setup java
uses: joschi/setup-jdk@v2
with:
java-version: 16
- name: Store Variables
id: variables
run: |
TAG=${GITHUB_REF/refs\/tags\//}
S3_PATH=${{ env.AWS_S3_BUCKET }}/scenebuilder/$TAG/
if [[ "$TAG" == *-RC* ]]; then
S3_PATH=${{ env.AWS_S3_BUCKET }}/scenebuilder/RC/$TAG/
fi
echo ::set-output name=SOURCE_TAG::$TAG
echo ::set-output name=S3_PATH::$S3_PATH
shell: bash
env:
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
- name: Create Kit Jar
run: |
chmod +x gradlew
export DISPLAY=:90
mkdir /home/runner/.vnc
echo 123456 | vncpasswd -f > /home/runner/.vnc/passwd
chmod -v 600 /home/runner/.vnc/passwd
vncserver :90 -localhost -nolisten tcp
./gradlew -i clean :kit:build -PVERSION=$TAG
vncserver -kill :90
env:
TAG: ${{ steps.variables.outputs.SOURCE_TAG }}
- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: SceneBuilder-Kit-Jar
path: kit/build/libs/*.jar
- name: Upload to AWS S3
run: |
aws s3 cp kit/build/libs/scenebuilder-kit-$TAG.jar $S3_PATH --acl public-read --region us-east-1 --debug
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
S3_PATH: ${{ steps.variables.outputs.S3_PATH }}
TAG: ${{ steps.variables.outputs.SOURCE_TAG }}
Loading

0 comments on commit 7f01f6d

Please sign in to comment.