Skip to content

Commit 00060cc

Browse files
committed
Fixed branch behavior and CI
1 parent b2f0826 commit 00060cc

2 files changed

Lines changed: 27 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: CI
22

33
on:
44
push:
5+
branches:
6+
- main
7+
- master
58
pull_request:
69

710
jobs:
@@ -21,6 +24,14 @@ jobs:
2124
- name: Set up Android SDK
2225
uses: android-actions/setup-android@v3
2326

27+
- name: Set up Codename One Build Client
28+
shell: bash
29+
run: |
30+
set -euo pipefail
31+
mkdir -p "$HOME/.codenameone"
32+
curl -fsSL https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/CodeNameOneBuildClient.jar \
33+
-o "$HOME/.codenameone/CodeNameOneBuildClient.jar"
34+
2435
- name: Compute snapshot version
2536
id: versions
2637
shell: bash
@@ -47,6 +58,12 @@ jobs:
4758
run: |
4859
set -euo pipefail
4960
chmod +x mvnw
61+
mkdir -p "$HOME/.codenameone" common/target/codenameone/tmpProject/lib
62+
curl -fsSL https://www.codenameone.com/files/updates/UpdateCodenameOne.jar \
63+
-o "$HOME/.codenameone/UpdateCodenameOne.jar" \
64+
|| curl -fsSL https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/UpdateCodenameOne.jar \
65+
-o "$HOME/.codenameone/UpdateCodenameOne.jar"
66+
java -jar "$HOME/.codenameone/UpdateCodenameOne.jar" common/target/codenameone/tmpProject force
5067
./mvnw -B -ntp package \
5168
-DskipTests \
5269
-Dopen=false \
@@ -75,6 +92,14 @@ jobs:
7592
java-version: "17"
7693
cache: maven
7794

95+
- name: Set up Codename One Build Client
96+
shell: bash
97+
run: |
98+
set -euo pipefail
99+
mkdir -p "$HOME/.codenameone"
100+
curl -fsSL https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/CodeNameOneBuildClient.jar \
101+
-o "$HOME/.codenameone/CodeNameOneBuildClient.jar"
102+
78103
- name: Compute snapshot version
79104
id: versions
80105
shell: bash

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<java.version>1.8</java.version>
5454
<java-tests.version>11</java-tests.version>
5555
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
56+
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
5657
<maven.compiler.source>8</maven.compiler.source>
5758
<maven.compiler.target>8</maven.compiler.target>
5859
<cn1lib.name>fingerprint-scanner</cn1lib.name>
@@ -203,6 +204,7 @@
203204
<plugin>
204205
<groupId>org.apache.maven.plugins</groupId>
205206
<artifactId>maven-source-plugin</artifactId>
207+
<version>${maven-source-plugin.version}</version>
206208
<executions>
207209
<execution>
208210
<id>attach-sources</id>

0 commit comments

Comments
 (0)