Merge pull request #10 from OpenSmock/dev-9

Fix #9
OpenSmock · Oct 20, 2024 · 8db6093 · 8db6093
2 parents 2c68a7d + 2027b9a
commit 8db6093
Show file tree

Hide file tree

Showing 23 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/Pharo11CI.yml b/.github/workflows/Pharo11CI.yml
@@ -1,10 +1,12 @@
 name: 'Pharo 11 CI'
 
+env: 
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 on:
   push:
     branches:
-      - '**'
-      - '!master'
+      - 'main'
   pull_request:
     types: [assigned, opened, synchronize, reopened]
 
@@ -24,6 +26,4 @@ jobs:
       - name: Load in New Image and Run Tests
         run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }}
         shell: bash
-        timeout-minutes: 10
-        env: 
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        timeout-minutes: 30
diff --git a/.github/workflows/Pharo12CI.yml b/.github/workflows/Pharo12CI.yml
@@ -1,10 +1,12 @@
 name: 'Pharo 12 CI'
 
+env: 
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 on:
   push:
     branches:
-      - '**'
-      - '!master'
+      - 'main'
   pull_request:
     types: [assigned, opened, synchronize, reopened]
 
@@ -24,6 +26,4 @@ jobs:
       - name: Load in New Image and Run Tests
         run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }}
         shell: bash
-        timeout-minutes: 10
-        env: 
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        timeout-minutes: 30
diff --git a/.project b/.project
@@ -1,4 +1,4 @@
 {
-	'srcDirectory' : '',
+	'srcDirectory' : 'src',
 	'tags' : [ #smock]
 }
diff --git a/.smalltalk.ston b/.smalltalk.ston
@@ -2,6 +2,7 @@ SmalltalkCISpec {
   #loading : [
     SCIMetacelloLoadSpec {
       #baseline : 'GeoTools',
+      #directory : 'src',
       #platforms : [ #pharo ]
     }
   ],

diff --git a/.properties → src/.properties b/.properties → src/.properties
diff --git a/...ineOfGeoTools/BaselineOfGeoTools.class.st → ...ineOfGeoTools/BaselineOfGeoTools.class.st b/...ineOfGeoTools/BaselineOfGeoTools.class.st → ...ineOfGeoTools/BaselineOfGeoTools.class.st
diff --git a/BaselineOfGeoTools/package.st → src/BaselineOfGeoTools/package.st b/BaselineOfGeoTools/package.st → src/BaselineOfGeoTools/package.st
diff --git a/...ls-Tests/AbsoluteCoordinatesTest.class.st → ...ls-Tests/AbsoluteCoordinatesTest.class.st b/...ls-Tests/AbsoluteCoordinatesTest.class.st → ...ls-Tests/AbsoluteCoordinatesTest.class.st
diff --git a/GeoTools-Tests/CoordinatesTests.class.st → src/GeoTools-Tests/CoordinatesTests.class.st b/GeoTools-Tests/CoordinatesTests.class.st → src/GeoTools-Tests/CoordinatesTests.class.st
diff --git a/...ls-Tests/GeoToolsExtensionsTests.class.st → ...ls-Tests/GeoToolsExtensionsTests.class.st b/...ls-Tests/GeoToolsExtensionsTests.class.st → ...ls-Tests/GeoToolsExtensionsTests.class.st
diff --git a/...ools-Tests/GeodesicUtilitiesTest.class.st → ...ools-Tests/GeodesicUtilitiesTest.class.st b/...ools-Tests/GeodesicUtilitiesTest.class.st → ...ools-Tests/GeodesicUtilitiesTest.class.st
diff --git a/GeoTools-Tests/KinematicsTests.class.st → src/GeoTools-Tests/KinematicsTests.class.st b/GeoTools-Tests/KinematicsTests.class.st → src/GeoTools-Tests/KinematicsTests.class.st
diff --git a/GeoTools-Tests/package.st → src/GeoTools-Tests/package.st b/GeoTools-Tests/package.st → src/GeoTools-Tests/package.st
diff --git a/GeoTools/AbsoluteCoordinates.class.st → src/GeoTools/AbsoluteCoordinates.class.st b/GeoTools/AbsoluteCoordinates.class.st → src/GeoTools/AbsoluteCoordinates.class.st
diff --git a/GeoTools/CartesianCoordinates.class.st → src/GeoTools/CartesianCoordinates.class.st b/GeoTools/CartesianCoordinates.class.st → src/GeoTools/CartesianCoordinates.class.st
diff --git a/GeoTools/GeodesicUtilities.class.st → src/GeoTools/GeodesicUtilities.class.st b/GeoTools/GeodesicUtilities.class.st → src/GeoTools/GeodesicUtilities.class.st
diff --git a/GeoTools/Kinematics.class.st → src/GeoTools/Kinematics.class.st b/GeoTools/Kinematics.class.st → src/GeoTools/Kinematics.class.st
diff --git a/GeoTools/ManifestGeoTools.class.st → src/GeoTools/ManifestGeoTools.class.st b/GeoTools/ManifestGeoTools.class.st → src/GeoTools/ManifestGeoTools.class.st
diff --git a/GeoTools/Number.extension.st → src/GeoTools/Number.extension.st b/GeoTools/Number.extension.st → src/GeoTools/Number.extension.st
diff --git a/GeoTools/Point.extension.st → src/GeoTools/Point.extension.st b/GeoTools/Point.extension.st → src/GeoTools/Point.extension.st
diff --git a/GeoTools/PolarCoordinates.class.st → src/GeoTools/PolarCoordinates.class.st b/GeoTools/PolarCoordinates.class.st → src/GeoTools/PolarCoordinates.class.st
diff --git a/GeoTools/WGS84.class.st → src/GeoTools/WGS84.class.st b/GeoTools/WGS84.class.st → src/GeoTools/WGS84.class.st
diff --git a/GeoTools/package.st → src/GeoTools/package.st b/GeoTools/package.st → src/GeoTools/package.st