From fca4c908c948b972e1f1d323e6ee4077992b5db2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:02:38 +0000 Subject: [PATCH 1/5] Bump actions/setup-java from v1 to v2 Bumps [actions/setup-java](https://github.com/actions/setup-java) from v1 to v2. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v1...8764a52df183aa0ccea74521dfd9d506ffc7a19a) Signed-off-by: dependabot[bot] --- .github/workflows/develop.yml | 2 +- .github/workflows/master.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 85c99331..655e80ca 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup - Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 11.0.x diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 0ad8d681..65cf39b2 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v2 - name: Setup - Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 11.0.x From f8621ddad665fe4add851ab4c17adf570e847120 Mon Sep 17 00:00:00 2001 From: litetex <40789489+litetex@users.noreply.github.com> Date: Tue, 6 Apr 2021 21:23:30 +0200 Subject: [PATCH 2/5] Renamed workflows --- .github/workflows/{develop.yml => checkBuild.yml} | 6 +++++- .github/workflows/{master.yml => release.yml} | 5 +---- 2 files changed, 6 insertions(+), 5 deletions(-) rename .github/workflows/{develop.yml => checkBuild.yml} (87%) rename .github/workflows/{master.yml => release.yml} (89%) diff --git a/.github/workflows/develop.yml b/.github/workflows/checkBuild.yml similarity index 87% rename from .github/workflows/develop.yml rename to .github/workflows/checkBuild.yml index 655e80ca..9ea22faf 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/checkBuild.yml @@ -1,11 +1,15 @@ -name: Develop CI +name: Check Build on: workflow_dispatch: push: branches: [ develop ] + paths-ignore: + - '**.md' pull_request: branches: [ develop ] + paths-ignore: + - '**.md' jobs: test: diff --git a/.github/workflows/master.yml b/.github/workflows/release.yml similarity index 89% rename from .github/workflows/master.yml rename to .github/workflows/release.yml index 65cf39b2..fe5e1bf4 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/release.yml @@ -1,13 +1,10 @@ -name: Master CI +name: Release on: workflow_dispatch: push: branches: [ master ] -# Don't use a cache here: -# This is the last instance that can detect missing dependecies - jobs: build_release: name: Build & Release From e4dd421a3e651d0282c130eb171c6b5c5097830d Mon Sep 17 00:00:00 2001 From: litetex <40789489+litetex@users.noreply.github.com> Date: Tue, 6 Apr 2021 21:23:53 +0200 Subject: [PATCH 3/5] Updated workflows --- .github/workflows/checkBuild.yml | 1 + .github/workflows/release.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index 9ea22faf..2d4afd3b 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -23,6 +23,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 11.0.x + distribution: 'adopt' - name: Setup - Restore Cache uses: actions/cache@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe5e1bf4..89bde45f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,6 +17,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: 11.0.x + distribution: 'adopt' - name: Build - Gradle run: ./gradlew build From 4bba591c7b2c055f71bcc156a601ae242bda30b3 Mon Sep 17 00:00:00 2001 From: litetex <40789489+litetex@users.noreply.github.com> Date: Tue, 6 Apr 2021 21:24:33 +0200 Subject: [PATCH 4/5] Added cache --- .github/workflows/release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89bde45f..964b862a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,6 +19,14 @@ jobs: java-version: 11.0.x distribution: 'adopt' + - name: Setup - Restore Cache + uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: | + ${{ runner.os }}-gradle- + - name: Build - Gradle run: ./gradlew build From f4d5dd15cbced16ae93ef7e024b1bd1c666d8e1a Mon Sep 17 00:00:00 2001 From: litetex <40789489+litetex@users.noreply.github.com> Date: Tue, 6 Apr 2021 21:26:15 +0200 Subject: [PATCH 5/5] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8ae0fdb9..e193a5c9 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# AvesFlower [![Build](https://img.shields.io/github/workflow/status/BaseMC/avesflower/Master%20CI)](https://github.com/BaseMC/avesflower/actions?query=workflow%3A%22Master+CI%22) [![Latest Version](https://img.shields.io/github/v/release/BaseMC/avesflower)](https://github.com/BaseMC/avesflower/releases) +# AvesFlower [![Build](https://img.shields.io/github/workflow/status/BaseMC/avesflower/Release)](https://github.com/BaseMC/avesflower/actions?query=workflow%3A%22Release%22) [![Latest Version](https://img.shields.io/github/v/release/BaseMC/avesflower)](https://github.com/BaseMC/avesflower/releases) Modificated version of [fernflower](https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine) (forked from [here](https://github.com/fesh0r/fernflower)) for the Aves project -### Development [![Build Develop](https://img.shields.io/github/workflow/status/BaseMC/avesflower/Develop%20CI/develop?label=build%20develop)](https://github.com/BaseMC/avesflower/actions?query=workflow%3A%22Develop+CI%22+branch%3Adevelop) +### Development [![Build Develop](https://img.shields.io/github/workflow/status/BaseMC/avesflower/Check%20Build/develop?label=build%20develop)](https://github.com/BaseMC/avesflower/actions?query=workflow%3A%22Check+Build%22+branch%3Adevelop) ### Licensing -* [license](LICENSE) for modifications -* used [licenses](LICENSES) -* Get modificated files: +* [License](LICENSE) for modifications +* Used [licenses](LICENSES) +* How to get modificated files: ```shell git remote add -f b https://github.com/fesh0r/fernflower.git git remote update