Skip to content

Commit 606c6b8

Browse files
guillepguillep
authored
Merge branch 'Pharo15' into remote-default-branch-name-2
2 parents 5514fbc + 3281a36 commit 606c6b8

456 files changed

Lines changed: 1676 additions & 1071 deletions

File tree

Some content is hidden

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

‎.github/workflows/test-all.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Libgit2-Pharo-Integration
2+
3+
env:
4+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5+
PHARO_CI_TESTING_ENVIRONMENT: 1
6+
7+
on:
8+
push:
9+
branches: [ Pharo14 ]
10+
pull_request:
11+
branches: [ Pharo14 ]
12+
13+
# Allows you to run this workflow manually from the Actions tab
14+
workflow_dispatch:
15+
16+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
17+
jobs:
18+
build:
19+
strategy:
20+
matrix:
21+
os: [ ubuntu-latest ]
22+
smalltalk: [ Pharo64-alpha ]
23+
runs-on: ${{ matrix.os }}
24+
name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
25+
steps:
26+
- uses: actions/checkout@v3
27+
- name: Setup smalltalkCI
28+
uses: hpi-swa/setup-smalltalkCI@v1
29+
with:
30+
smalltalk-image: ${{ matrix.smalltalk }}
31+
- name: Load Image and Run Release Tests
32+
run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalk.release.ston
33+
timeout-minutes: 10
34+
- name: Clean Up
35+
run: rm -Rf ${{ env.SMALLTALK_CI_BUILD }}
36+
- name: Load Image and Run Tests
37+
run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalk.all.ston
38+
timeout-minutes: 30

‎.github/workflows/test.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Tests
2+
3+
on: [ push, pull_request ]
4+
5+
jobs:
6+
tests:
7+
strategy:
8+
fail-fast: false
9+
matrix:
10+
smalltalk: [ Pharo64-alpha ]
11+
os: [ ubuntu-latest, macOS-latest ]
12+
ston: [ .smalltalk.ston ]
13+
runs-on: ${{ matrix.os }}
14+
name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
15+
steps:
16+
- uses: actions/checkout@v3
17+
- name: Setup smalltalkCI
18+
uses: hpi-swa/setup-smalltalkCI@v1
19+
with:
20+
smalltalk-version: ${{ matrix.smalltalk }}
21+
- name: Load Image and Run Tests
22+
run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }}
23+
shell: bash
24+
timeout-minutes: 30

‎.github/workflows/unit-tests.yml‎

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

‎.smalltalk.all.ston‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
SmalltalkCISpec {
2+
#preLoading : './scripts/preLoading.st',
3+
#loading : [
4+
SCIMetacelloLoadSpec {
5+
#baseline : 'LibGit',
6+
#directory : '.',
7+
#load : [ 'LibGit-Tests' ],
8+
#platforms : [ #pharo ]
9+
}
10+
],
11+
#preTesting : './scripts/preTesting.st',
12+
#testing : {
13+
#include : {
14+
#packages : [ '.*' ]
15+
},
16+
#exclude : {
17+
#packages : [
18+
'GT-Tests.*',
19+
'Glamour-Tests.*',
20+
'UnifiedFFI.*',
21+
'ThreadedFFI.*',
22+
'Monticello.*',
23+
'Metacello.*',
24+
'System-Settings-Tests.*',
25+
'RPackage.*',
26+
'ReleaseTests.*' ],
27+
#classes : [
28+
#OutOfMemoryTest,
29+
#TraitFileOutTest,
30+
#PlatformResolverTest,
31+
#ProcessSpecificTest
32+
]
33+
}
34+
}
35+
}

‎.smalltalk.release.ston‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
SmalltalkCISpec {
2+
#preLoading : './scripts/preLoading.st',
3+
#loading : [
4+
SCIMetacelloLoadSpec {
5+
#baseline : 'LibGit',
6+
#directory : '.',
7+
#load : [ 'LibGit-Tests' ],
8+
#platforms : [ #pharo ]
9+
}
10+
],
11+
#preTesting : './scripts/preTesting.st',
12+
#testing : {
13+
#packages : [
14+
'System-Settings-Tests.*',
15+
'ReleaseTests.*' ]
16+
}
17+
}

.smalltalkci/.unit-tests.ston renamed to .smalltalk.ston

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
SmalltalkCISpec {
2-
#preLoading : '../scripts/preLoading.st',
2+
#preLoading : './scripts/preLoading.st',
33
#loading : [
44
SCIMetacelloLoadSpec {
55
#baseline : 'LibGit',
6-
#directory : '..',
6+
#directory : '.',
77
#load : [ 'LibGit-Tests' ],
88
#platforms : [ #pharo ]
99
}
1010
]
11-
}
11+
}

LibGit-Core.package/LGitAbstractCloneOptions.class/README.md renamed to LibGit-Core.package/LGitAbstractBlameHunk.class/README.md

LibGit-Core.package/LGitAbstractCloneOptions.class/properties.json renamed to LibGit-Core.package/LGitAbstractBlameHunk.class/properties.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
{
22
"commentStamp" : "",
3-
"super" : "LGitStructWithDefaults",
3+
"super" : "LGitExternalStructure",
44
"category" : "LibGit-Core-FFI-Structs",
55
"classinstvars" : [ ],
66
"pools" : [ ],
77
"classvars" : [ ],
8-
"instvars" : [
9-
"fetchOptions"
10-
],
11-
"name" : "LGitAbstractCloneOptions",
8+
"instvars" : [ ],
9+
"name" : "LGitAbstractBlameHunk",
1210
"type" : "normal"
1311
}

‎LibGit-Core.package/LGitAbstractCloneOptions.class/class/isAbstract.st‎

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

‎LibGit-Core.package/LGitAbstractCloneOptions.class/instance/clone_init_options.version..st‎

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

0 commit comments

Comments
 (0)