Skip to content

Commit 8098116

Browse files
committed
wip
1 parent 1f688e9 commit 8098116

5 files changed

Lines changed: 41 additions & 43 deletions

File tree

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/* export-ignore
55

66
# Export white-listed production code only.
7-
/bin -export-ignore
7+
/bin/php-matrix -export-ignore
88
/data -export-ignore
99
/src -export-ignore
1010
/composer.json -export-ignore

.github/workflows/update-version-data.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
22+
with:
23+
persist-credentials: false
2224

23-
- uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # master
25+
- uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # 2.37.0
2426
with:
2527
php-version: '8.5'
2628
coverage: none
@@ -29,9 +31,8 @@ jobs:
2931
with:
3032
go-version-file: 'go.mod'
3133

32-
- run: make version-data
33-
env:
34-
MAKEFLAGS: "--jobs=4 --output-sync=target"
34+
- run: ./bin/generate-test-data
35+
- run: ./bin/generate-all-versions
3536

3637
- uses: typisttech/.github/.github/actions/create-auto-merged-pull-request@45c776c6114c7493626281d38635f0578b3b2c7d # v3.5.0
3738
with:

bin/generate-test-data

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env zsh -x
2+
set -eo pipefail
3+
4+
rm -rf tests/data/versions
5+
mkdir -p tests/data/versions
6+
curl 'https://www.php.net/releases/index.php?json&max=1000&version=5' | jq . > tests/data/versions/v5.json
7+
curl 'https://www.php.net/releases/index.php?json&max=1000&version=7' | jq . > tests/data/versions/v7.json
8+
curl 'https://www.php.net/releases/index.php?json&max=1000&version=8' | jq . > tests/data/versions/v8.json

mise.toml

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,46 @@
11
[tools]
22
# Must be kept in sync with GitHub Actions workflow @.github/workflows/lint.yml
3-
golangci-lint = "2.11"
3+
golangci-lint = '2.11'
44

55
[env]
66
GOFLAGS = '-mod=mod'
77

88
[tasks.vendor]
99
run = [
10-
"composer install --no-dev --prefer-dist",
11-
"composer reinstall --prefer-dist '*'",
10+
'composer install --no-dev --prefer-dist',
11+
'composer reinstall --prefer-dist "*"',
1212
]
1313

1414
[tasks.phar]
15-
depends = [{ task = "vendor" }]
15+
depends = ['vendor']
1616
run = [
17-
"box compile",
18-
"box verify phar/php-matrix",
19-
"box info phar/php-matrix",
20-
"php phar/php-matrix --version"
17+
'box compile',
18+
'box verify phar/php-matrix',
19+
'box info phar/php-matrix',
20+
'php phar/php-matrix --version',
2121
]
2222

23-
[tasks."test:bin"]
24-
env.PATH = "{{ config_root }}/bin:{{ env.PATH }}"
25-
depends = [{ task = "vendor" }]
26-
run = "go test -count=1 -shuffle=on ./..."
23+
[tasks.'test:bin']
24+
env.PATH = '{{ config_root }}/bin:{{ env.PATH }}'
25+
depends = [{ task = 'vendor' }]
26+
run = 'go test -count=1 -shuffle=on ./...'
2727

28-
[tasks."test:phar"]
29-
env.PATH = "{{ config_root }}/phar:{{ env.PATH }}"
30-
depends = [{ task = "phar" }]
31-
run = "go test -count=1 -shuffle=on ./..."
28+
[tasks.'test:phar']
29+
env.PATH = '{{ config_root }}/phar:{{ env.PATH }}'
30+
depends = ['phar']
31+
run = 'go test -count=1 -shuffle=on ./...'
3232

33-
[tasks."tests:data:versions"]
34-
run = [
35-
"rm -rf tests/data/versions",
36-
"mkdir -p tests/data/versions",
37-
"curl 'https://www.php.net/releases/index.php?json&max=1000&version=5' | jq . > tests/data/versions/v5.json",
38-
"curl 'https://www.php.net/releases/index.php?json&max=1000&version=7' | jq . > tests/data/versions/v7.json",
39-
"curl 'https://www.php.net/releases/index.php?json&max=1000&version=8' | jq . > tests/data/versions/v8.json",
40-
]
33+
[tasks.gen]
34+
depends = ['gen:test-data', 'gen:data']
4135

42-
[tasks."data:all-versions"]
43-
depends = [{ task = "vendor" }]
44-
run = "{{ config_root }}/bin/update-all-versions"
36+
[tasks.'gen:test-data']
37+
depends = ['vendor']
38+
run = '{{ config_root }}/bin/generate-test-data'
4539

46-
[tasks."version-data"]
47-
depends = [
48-
{ task = "tests:data:versions" },
49-
{ task = "data:all-versions" },
50-
]
40+
[tasks.'gen:data']
41+
depends = ['vendor']
42+
run = '{{ config_root }}/bin/generate-data'
5143

52-
[tasks."txtar"]
53-
depends = [{ task = "data:all-versions" }]
54-
run = [
55-
"go generate ./...",
56-
"UPDATE_SCRIPTS=0 mise run test:bin",
57-
]
44+
[tasks.'txtar']
45+
depends = ['gen']
46+
run = ['go generate ./...', 'UPDATE_SCRIPTS=0 mise run test:bin']

0 commit comments

Comments
 (0)