Skip to content

Commit 7fe5831

Browse files
committed
Merge branch 'pu'
2 parents f683d08 + c73f669 commit 7fe5831

File tree

83 files changed

+1283
-698
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1283
-698
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
1919
restore-keys: |
2020
${{ runner.os }}-m2-
21+
- uses: gleam-lang/[email protected]
22+
with:
23+
otp-version: 23.2
2124
- name: erl
2225
run: erl -version
2326
- uses: actions/setup-ruby@v1

.github/workflows/release.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Release with Maven
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
# or when creating/publishing a release?
8+
9+
jobs:
10+
deploy:
11+
if: false # disable for now
12+
#if: github.repository_owner == 'erlang'
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Set up JDK 8
18+
uses: actions/setup-java@v1
19+
with:
20+
java-version: 8
21+
- name: Cache Maven packages
22+
uses: actions/cache@v2
23+
with:
24+
path: ~/.m2
25+
key: ${{ runner.os }}-m2-release-${{ hashFiles('**/pom.xml', '**/*.yml') }}
26+
restore-keys: ${{ runner.os }}-m2-
27+
- name: Configure Git
28+
run: |
29+
git config --global user.name 'GitHub Actions'
30+
git config --global user.email '[email protected]'
31+
- name: Build with Maven
32+
run: >
33+
mvn deploy
34+
-Phelp,release-composite
35+
-Dgithub-update-repo=https://x-access-token:${{ secrets.ERLIDE_DEPLOY_TOKEN }}@github.com/erlide/erlide.github.io.git
36+
working-directory: .

Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.PHONY: build deploy
2+
3+
build:
4+
./mvnw -B -U enforcer:display-info clean verify -Phelp
5+
6+
deploy:
7+
./mvnw -B -U deploy -P help,release-composite

build

Lines changed: 0 additions & 3 deletions
This file was deleted.

extras/org.erlide.licenses/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.erlide</groupId>
88
<artifactId>org.erlide.parent</artifactId>
9-
<version>0.59.0-SNAPSHOT</version>
9+
<version>0.60.1-SNAPSHOT</version>
1010
<relativePath>../..</relativePath>
1111
</parent>
1212

extras/wrangler/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.erlide</groupId>
88
<artifactId>org.erlide.parent</artifactId>
9-
<version>0.59.0-SNAPSHOT</version>
9+
<version>0.60.1-SNAPSHOT</version>
1010
<relativePath>../..</relativePath>
1111
</parent>
1212

features/org.erlide/feature.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="org.erlide"
44
label="Erlang language tools IDE"
5-
version="0.59.0.qualifier"
5+
version="0.60.1.qualifier"
66
provider-name="%vendorName"
77
plugin="org.erlide.branding"
88
image="erlang-64.gif"

features/org.erlide/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>org.erlide</groupId>
99
<artifactId>org.erlide.parent</artifactId>
10-
<version>0.59.0-SNAPSHOT</version>
10+
<version>0.60.1-SNAPSHOT</version>
1111
<relativePath>../..</relativePath>
1212
</parent>
1313

1414
<artifactId>org.erlide</artifactId>
15-
<version>0.59.0-SNAPSHOT</version>
15+
<version>0.60.1-SNAPSHOT</version>
1616
<packaging>eclipse-feature</packaging>
1717

1818
</project>

libs/com.google.truth/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.erlide</groupId>
99
<artifactId>org.erlide.parent</artifactId>
10-
<version>0.59.0-SNAPSHOT</version>
10+
<version>0.60.1-SNAPSHOT</version>
1111
<relativePath>../..</relativePath>
1212
</parent>
1313

libs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.erlide</groupId>
88
<artifactId>org.erlide.parent</artifactId>
9-
<version>0.59.0-SNAPSHOT</version>
9+
<version>0.60.1-SNAPSHOT</version>
1010
<relativePath>..</relativePath>
1111
</parent>
1212

0 commit comments

Comments
 (0)