Skip to content

Commit 6b6a529

Browse files
authored
Merge pull request #5 from ba-st-dependencies/pharo11
Add Pharo 11 to the build matrix
2 parents 8abf30f + b5b6fdc commit 6b6a529

26 files changed

+19
-16
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
*.st linguist-language=Smalltalk
2+
*.st eol=lf
3+
*.st text diff

.github/workflows/loading-groups.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
11+
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0 ]
1212
load-spec: [ core, tests ]
1313
name: ${{ matrix.smalltalk }} + ${{ matrix.load-spec }}
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- uses: hpi-swa/setup-smalltalkCI@v1
1717
with:
1818
smalltalk-image: ${{ matrix.smalltalk }}

.github/workflows/unit-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, Pharo32-7.0 ]
10+
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0 ]
1111
name: ${{ matrix.smalltalk }}
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
- uses: hpi-swa/setup-smalltalkCI@v1
1515
with:
1616
smalltalk-image: ${{ matrix.smalltalk }}
@@ -19,7 +19,7 @@ jobs:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
timeout-minutes: 15
2121
- name: Upload coverage to Codecov
22-
uses: codecov/codecov-action@v1
22+
uses: codecov/codecov-action@v3
2323
with:
24-
name: ${{matrix.os}}-${{matrix.smalltalk}}
24+
name: Unit-Tests-${{matrix.smalltalk}}
2525
token: ${{ secrets.CODECOV_TOKEN }}

.project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
'srcDirectory' : ''
3-
}
2+
'srcDirectory' : 'source'
3+
}

.smalltalkci/.loading.core.ston

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SmalltalkCISpec {
22
#loading : [
33
SCIMetacelloLoadSpec {
44
#baseline : 'ObjectPool',
5-
#directory : '..',
5+
#directory : '../source',
66
#load : [ 'Core' ],
77
#platforms : [ #pharo ]
88
}

.smalltalkci/.loading.tests.ston

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SmalltalkCISpec {
22
#loading : [
33
SCIMetacelloLoadSpec {
44
#baseline : 'ObjectPool',
5-
#directory : '..',
5+
#directory : '../source',
66
#load : [ 'Tests' ],
77
#platforms : [ #pharo ]
88
}

.smalltalkci/.unit-tests.ston

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SmalltalkCISpec {
22
#loading : [
33
SCIMetacelloLoadSpec {
44
#baseline : 'ObjectPool',
5-
#directory : '..',
5+
#directory : '../source',
66
#load : [ 'Tests' ],
77
#platforms : [ #pharo ]
88
}

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@
99
[![Pharo 8.0](https://img.shields.io/badge/Pharo-8.0-informational)](https://pharo.org)
1010
[![Pharo 9.0](https://img.shields.io/badge/Pharo-9.0-informational)](https://pharo.org)
1111
[![Pharo 10](https://img.shields.io/badge/Pharo-10-informational)](https://pharo.org)
12+
[![Pharo 11](https://img.shields.io/badge/Pharo-11-informational)](https://pharo.org)
1213

1314
Object Pool offers easy way to build pools for objects. One common situation
1415
could be pooling database connections. This library was created for supporting pooling
15-
of GlorpDBX database connections. However GlorpDBX related code is different
16+
of GlorpDBX database connections. However, GlorpDBX related code is different
1617
package.
1718

18-
Objects borrowed from OPPool have following basic lifecycle:
19+
Objects borrowed from `OPPool` have following basic lifecycle:
1920

2021
1. Objects are first created.
21-
2. When objects are borrowed from pool they are activated..
22+
2. When objects are borrowed from pool they are activated.
2223
3. When objects are returned to pool they are passivated.
23-
4. When objects is no longer usable (some lifecycle operation fails) or needed
24+
4. When objects are no longer usable (some lifecycle operation fails) or needed
2425
it is destroyed.
2526

2627
To create pool for of OrderedCollections one could write:
@@ -56,7 +57,7 @@ pool validator:[:o|o size = 0].
5657
```
5758

5859
One can set maximum size of pool with #maxIdleObjects. See more about pool configuration
59-
in documentation of OPBasicPool.
60+
in documentation of `OPBasicPool`.
6061

6162
## Installation
6263

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)