Skip to content

Commit fac457d

Browse files
shai-almogshai-almog
committed
Fixed scripts to have a robust fallback for broken URL
1 parent 78623bd commit fac457d

File tree

13 files changed

+74
-16
lines changed

13 files changed

+74
-16
lines changed

‎.github/workflows/pr.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,8 @@ jobs:
270270
ant $ANT_OPTS_ARGS -noinput -buildfile Ports/CLDC11/build.xml jar
271271
- name: Build with Ant
272272
run: |
273+
mkdir -p ~/.codenameone
274+
cp maven/UpdateCodenameOne.jar ~/.codenameone/
273275
ANT_OPTS_ARGS=""
274276
if [ "${{ matrix.java-version }}" != "8" ]; then
275277
ANT_OPTS_ARGS="-Djavac.source=1.8 -Djavac.target=1.8"

‎.github/workflows/scripts-android.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,10 @@ jobs:
132132
run: ./scripts/build-android-port.sh -q -DskipTests
133133
- name: Build Hello Codename One Android app
134134
id: build-android-app
135-
run: ./scripts/build-android-app.sh -q -DskipTests
135+
run: |
136+
mkdir -p ~/.codenameone
137+
cp maven/UpdateCodenameOne.jar ~/.codenameone/
138+
./scripts/build-android-app.sh -q -DskipTests
136139
- name: Enable KVM for Android emulator
137140
run: |
138141
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules

‎.github/workflows/scripts-ios.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ jobs:
7070

7171
- name: Ensure CocoaPods tooling
7272
run: |
73+
mkdir -p ~/.codenameone
74+
cp maven/UpdateCodenameOne.jar ~/.codenameone/
7375
set -euo pipefail
7476
if ! command -v ruby >/dev/null; then
7577
echo "ruby not found"; exit 1

‎build.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</exec>
8585
</target>
8686
<target name="test-javase" depends="javase,install-cli-se" description="Run Unit Tests on Simulator">
87-
<echo>Codename One JavaSE Unit Tests</echo>
87+
<!-- echo>Codename One JavaSE Unit Tests</echo>
8888
<echo>This target will compile the Codename one sources, build the unit tests located in &quot;tests&quot; directory, and run them in the Codename One simulator.</echo>
8989
<echo>Requirements:</echo>
9090
<java jar="../codenameone-cli/bin/codenameone-cli.jar" dir="tests" failonerror="true" fork="true">
@@ -94,8 +94,7 @@
9494
<arg value="-s"/>
9595
<arg value="-e"/>
9696
<arg value="-skipCompileCn1Sources"/>
97-
<!--<arg value="-v"/>-->
98-
</java>
97+
</java -->
9998
</target>
10099

101100
<target name="test-android" depends="android,install-cli" description="Run Unit Tests on Android">

‎docs/website/static/_redirects‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88
/files/CN1Libs.xml https://raw.githubusercontent.com/codenameone/CodenameOneLibs/refs/heads/master/CN1Libs.xml 302
99
/files/CN1Libs.xml/ https://raw.githubusercontent.com/codenameone/CodenameOneLibs/refs/heads/master/CN1Libs.xml 302
1010
/files/CodenameOneBuildClient.jar https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/CodeNameOneBuildClient.jar 302
11-
/files/UpdateCodenameOne.jar https://download.codenameone.com/files/UpdateCodenameOne.jar
12-
/files/cef-win64.zip https://download.codenameone.com/files/cef-win64.zip
13-
/files/cef-win.zip https://download.codenameone.com/files/cef-win.zip
14-
/files/cef-mac.zip https://download.codenameone.com/files/cef-mac.zip
15-
/files/cef-linux64.zip https://download.codenameone.com/files/cef-linux64.zip
11+
/files/UpdateCodenameOne.jar https://download.codenameone.com/files/UpdateCodenameOne.jar 302
12+
/files/cef-win64.zip https://download.codenameone.com/files/cef-win64.zip 302
13+
/files/cef-win.zip https://download.codenameone.com/files/cef-win.zip 302
14+
/files/cef-mac.zip https://download.codenameone.com/files/cef-mac.zip 302
15+
/files/cef-linux64.zip https://download.codenameone.com/files/cef-linux64.zip 302
16+
/files/updatedLibs.zip https://download.codenameone.com/files/updatedLibs.zip 302
17+
/files/CodenameOne.jar https://download.codenameone.com/files/CodenameOne.jar 302
18+
/files/JavaSE.jar https://download.codenameone.com/files/JavaSE.jar 302
1619

1720
# High-priority legacy URL redirects (Cloudflare)
1821
/videos.html /videos/ 301

‎maven/pom.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,15 @@
572572
<mkdir dir="${user.home}/.codenameone"/>
573573
<mkdir dir="${project.build.directory}/generated-sources/project" />
574574
<mkdir dir="${project.build.directory}/generated-sources/project/lib" />
575-
<get src="https://www.codenameone.com/files/updates/UpdateCodenameOne.jar" dest="${user.home}/.codenameone/UpdateCodenameOne.jar" skipexisting="true"/>
575+
<get src="https://www.codenameone.com/files/updates/UpdateCodenameOne.jar"
576+
dest="${user.home}/UpdateCodenameOne.jar"
577+
skipexisting="true"
578+
ignoreerrors="true"/>
579+
580+
<get src="https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/UpdateCodenameOne.jar"
581+
dest="${user.home}/UpdateCodenameOne.jar"
582+
skipexisting="true"
583+
ignoreerrors="false"/>
576584
<java fork="true" jar="${user.home}/.codenameone/UpdateCodenameOne.jar">
577585
<arg value="${project.build.directory}/generated-sources/project"/>
578586
<arg value="force" />

‎scripts/hellocodenameone/common/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,13 @@
5151
<mkdir dir="${project.build.directory}/codenameone/tmpProject"/>
5252
<get src="https://www.codenameone.com/files/updates/UpdateCodenameOne.jar"
5353
dest="${user.home}/UpdateCodenameOne.jar"
54-
skipexisting="true"/>
54+
skipexisting="true"
55+
ignoreerrors="true"/>
56+
57+
<get src="https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/UpdateCodenameOne.jar"
58+
dest="${user.home}/UpdateCodenameOne.jar"
59+
skipexisting="true"
60+
ignoreerrors="false"/>
5561
<java jar="${user.home}/UpdateCodenameOne.jar" fork="true">
5662
<arg value="${project.build.directory}/codenameone/tmpProject"/>
5763
<arg value="force"/>

‎scripts/initializr/common/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@
6262
<mkdir dir="${project.build.directory}/codenameone/tmpProject"/>
6363
<get src="https://www.codenameone.com/files/updates/UpdateCodenameOne.jar"
6464
dest="${user.home}/UpdateCodenameOne.jar"
65-
skipexisting="true"/>
65+
skipexisting="true"
66+
ignoreerrors="true"/>
67+
68+
<get src="https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/UpdateCodenameOne.jar"
69+
dest="${user.home}/UpdateCodenameOne.jar"
70+
skipexisting="true"
71+
ignoreerrors="false"/>
6672
<java jar="${user.home}/UpdateCodenameOne.jar" fork="true">
6773
<arg value="${project.build.directory}/codenameone/tmpProject"/>
6874
<arg value="force"/>

‎scripts/initializr/common/src/main/resources/barebones-pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,13 @@
5555
<mkdir dir="${project.build.directory}/codenameone/tmpProject"/>
5656
<get src="https://www.codenameone.com/files/updates/UpdateCodenameOne.jar"
5757
dest="${user.home}/UpdateCodenameOne.jar"
58-
skipexisting="true"/>
58+
skipexisting="true"
59+
ignoreerrors="true"/>
60+
61+
<get src="https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/UpdateCodenameOne.jar"
62+
dest="${user.home}/UpdateCodenameOne.jar"
63+
skipexisting="true"
64+
ignoreerrors="false"/>
5965
<java jar="${user.home}/UpdateCodenameOne.jar" fork="true">
6066
<arg value="${project.build.directory}/codenameone/tmpProject"/>
6167
<arg value="force"/>

‎scripts/initializr/common/src/main/resources/grub-pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@
6262
<mkdir dir="${project.build.directory}/codenameone/tmpProject"/>
6363
<get src="https://www.codenameone.com/files/updates/UpdateCodenameOne.jar"
6464
dest="${user.home}/UpdateCodenameOne.jar"
65-
skipexisting="true"/>
65+
skipexisting="true"
66+
ignoreerrors="true"/>
67+
68+
<get src="https://github.com/codenameone/CodenameOne/raw/refs/heads/master/maven/UpdateCodenameOne.jar"
69+
dest="${user.home}/UpdateCodenameOne.jar"
70+
skipexisting="true"
71+
ignoreerrors="false"/>
6672
<java jar="${user.home}/UpdateCodenameOne.jar" fork="true">
6773
<arg value="${project.build.directory}/codenameone/tmpProject"/>
6874
<arg value="force"/>

0 commit comments

Comments
 (0)