Skip to content

Commit 3047af5

Browse files
authored
Merge branch 'Stivo182:master' into master
2 parents 4b0561c + 28519d8 commit 3047af5

File tree

2 files changed

+18
-88
lines changed

2 files changed

+18
-88
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,16 @@
1-
name: Публикация в хаб
1+
name: Публикация релиза
22

33
on:
44
release:
55
types:
66
- published
7-
8-
env:
9-
PACKAGE_MASK: "compressor-*.ospx"
10-
OSCRIPT_VERSION: "default"
7+
workflow_dispatch:
118

129
jobs:
13-
build:
14-
runs-on: ubuntu-latest
15-
steps:
16-
- name: Актуализация
17-
uses: actions/checkout@v4
18-
19-
- name: Установка .NET
20-
uses: actions/[email protected]
21-
with:
22-
dotnet-version: 8.x.x
23-
24-
- name: Вычисление версии OneScript
25-
shell: bash
26-
id: extract_oscript_version
27-
run: |
28-
set -ex
29-
if [ "${{ env.OSCRIPT_VERSION }}" = "default" ]
30-
then
31-
extracted_version=$(cat packagedef | grep ".ВерсияСреды(" | sed 's|[^"]*"||' | sed -r 's/".+//' || true)
32-
version="${extracted_version:-stable}"
33-
else
34-
version="${{ env.OSCRIPT_VERSION }}"
35-
fi
36-
echo "version=$version" >> $GITHUB_OUTPUT
37-
38-
- name: Установка OneScript
39-
uses: otymko/[email protected]
40-
with:
41-
version: ${{ steps.extract_oscript_version.outputs.version }}
42-
43-
- name: Установка зависимостей
44-
run: |
45-
opm install opm
46-
opm install -l
47-
48-
- name: Сборка пакета
49-
run: opm build
50-
51-
- name: Заливка артефактов
52-
uses: actions/upload-artifact@v4
53-
with:
54-
name: package.zip
55-
path: ./${{ env.PACKAGE_MASK }}
56-
57-
- name: Публикация в hub.oscript.io
58-
shell: bash
59-
env:
60-
GITHUB_OAUTH_TOKEN: ${{ secrets.PUSH_TOKEN }}
61-
OPM_HUB_CHANNEL: stable
62-
run: opm push ${{ env.PACKAGE_MASK }}
10+
release:
11+
uses: autumn-library/workflows/.github/workflows/release.yml@v1
12+
with:
13+
package_mask: "compressor-*.ospx"
14+
dotnet_version: "8.x.x"
15+
secrets:
16+
PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }}

.github/workflows/test.yml

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,18 @@
11
name: Тестирование
22

3-
on:
3+
on:
44
push:
55
pull_request:
6-
7-
env:
8-
TEST_SCRIPT_PATH: './tasks/test.os'
6+
workflow_dispatch:
97

108
jobs:
11-
build:
12-
runs-on: ${{ matrix.os }}
9+
test:
1310
strategy:
1411
fail-fast: false
1512
matrix:
16-
os: [macos-latest, ubuntu-latest, windows-latest]
17-
oscript_version: [stable, dev]
18-
19-
steps:
20-
- name: Актуализация
21-
uses: actions/checkout@v4
22-
23-
- name: Установка .NET
24-
uses: actions/[email protected]
25-
with:
26-
dotnet-version: 8.x.x
27-
28-
- name: Установка OneScript
29-
uses: otymko/setup-onescript@master
30-
with:
31-
version: ${{ matrix.oscript_version }}
32-
33-
- name: Установка зависимостей
34-
run: |
35-
opm install opm
36-
opm install -l --dev
37-
38-
- name: Сборка пакета
39-
run: opm build
40-
41-
- name: Тестирование
42-
run: oscript ${{ env.TEST_SCRIPT_PATH }}
13+
oscript_version: ['stable', 'dev']
14+
uses: autumn-library/workflows/.github/workflows/test.yml@v1
15+
with:
16+
oscript_version: ${{ matrix.oscript_version }}
17+
dotnet_version: "8.x.x"
18+
build_package: true

0 commit comments

Comments
 (0)