Skip to content

Commit b611c1c

Browse files
Merge pull request #61 from tidal/pkg-split
Add initial setup for splitting composer packages
2 parents 9418b3f + 2983942 commit b611c1c

File tree

5 files changed

+47
-13
lines changed

5 files changed

+47
-13
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: gitsplit
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- split
7+
release:
8+
types: [published]
9+
create:
10+
workflow_dispatch:
11+
12+
jobs:
13+
gitsplit:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: checkout
17+
run: git clone "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" "$GITHUB_WORKSPACE" && cd "$GITHUB_WORKSPACE" && git checkout $GITHUB_SHA
18+
- name: Split repositories
19+
uses: docker://jderusse/gitsplit:latest
20+
with:
21+
args: gitsplit
22+
env:
23+
GH_TOKEN: ${{ secrets.GITSPLIT_TOKEN }}

.gitsplit.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Path to a cache directory Used to speed up the split over time by reusing git's objects
2+
cache_url: "/cache/gitsplit"
3+
4+
# Path to the repository to split (default = current path)
5+
project_url: "https://github.com/open-telemetry/opentelemetry-php-contrib.git"
6+
7+
# List of splits.
8+
splits:
9+
- prefix: "src/Aws"
10+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-aws.git"
11+
- prefix: "src/Symfony/OtelSdkBundle"
12+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-sdk-bundle.git"
13+
14+
# List of references to split (defined as regexp)
15+
origins:
16+
- ^main$
17+
- ^test$
18+
- ^split$
19+
- ^v\d+\.\d+\.\d+$
20+
- ^\d+\.\d+\.\d+$

composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
"require": {
1515
"php": "^7.4 || ^8.0",
1616
"ext-json": "*",
17-
"open-telemetry/opentelemetry": "^0.0.8",
17+
"open-telemetry/opentelemetry": "^0.0.10",
1818
"php-http/discovery": "^1.14",
1919
"php-http/message": "^1.12"
2020
},
2121
"replace": {
2222
"open-telemetry/otel-sdk-bundle": "self.version"
2323
},
24-
"conflict": {
25-
"open-telemetry/opentelemetry": "<=0.0.3"
26-
},
2724
"autoload": {
2825
"psr-4": {
2926
"OpenTelemetry\\": "src"

src/Aws/composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
"prefer-stable": true,
1515
"require": {
1616
"php": "^7.4 || ^8.0",
17-
"open-telemetry/opentelemetry": "^0.0.4"
18-
},
19-
"conflict": {
20-
"open-telemetry/opentelemetry": "<=0.0.3"
17+
"open-telemetry/opentelemetry": "^0.0.10"
2118
},
2219
"autoload": {
2320
"psr-4": {

src/Symfony/OtelSdkBundle/composer.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@
1414
"prefer-stable": true,
1515
"require": {
1616
"php": "^7.4 || ^8.0",
17-
"open-telemetry/opentelemetry": "^0.0.5",
17+
"open-telemetry/opentelemetry": "^0.0.10",
1818
"php-http/message": "^1.12",
1919
"php-http/discovery": "^1.14",
2020
"symfony/config": "^4.4|^5.3|^6.0",
2121
"symfony/options-resolver": "^4.4|^5.3|^6.0",
2222
"symfony/polyfill-php80": "^1.16",
2323
"symfony/dependency-injection": "^4.4|^5.3|^6.0"
24-
},
25-
"conflict": {
26-
"open-telemetry/opentelemetry": "<=0.0.3"
27-
},
24+
},s
2825
"autoload": {
2926
"psr-4": {
3027
"OpenTelemetry\\Symfony\\OtelSdkBundle\\": "."

0 commit comments

Comments
 (0)