From 75b0abe8c44dfbec8015874b4f8e0a8260a0771c Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Tue, 23 Jan 2024 17:40:52 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B5=D0=B7=D0=B4=20?= =?UTF-8?q?=D0=BD=D0=B0=201.9.0=20=D0=B8=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9?= =?UTF-8?q?=20workflow=20=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B5=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/perfomance.yml | 2 +- .github/workflows/qa.yml | 1 - .github/workflows/release.yml | 68 ++++++-------------------------- .github/workflows/testing.yml | 2 +- packagedef | 2 +- 5 files changed, 16 insertions(+), 59 deletions(-) diff --git a/.github/workflows/perfomance.yml b/.github/workflows/perfomance.yml index fbc46bf..88d0336 100644 --- a/.github/workflows/perfomance.yml +++ b/.github/workflows/perfomance.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - oscript_version: ['dev', 'lts-dev'] + oscript_version: ['dev', 'lts-dev', 'default'] uses: autumn-library/workflows/.github/workflows/test.yml@main with: oscript_version: ${{ matrix.oscript_version }} diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 259949f..2f7116f 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -10,6 +10,5 @@ jobs: uses: autumn-library/workflows/.github/workflows/sonar.yml@main with: github_repository: autumn-library/autumn - oscript_version: lts-dev secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5ad85e4..6baa3c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,57 +1,15 @@ -# MIT License -# Copyright (C) 2020 Tymko Oleg and contributors -# All rights reserved. +name: Публикация релиза -name: Подготовка релиза и публикация в хабе -# Только события создания и изменения релиза on: - release: - types: [published, edited] - -env: - PACKAGE_MASK: autumn-*.ospx - -jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - oscript_version: ['stable'] - - steps: - # Загрузка проекта - - name: Актуализация - uses: actions/checkout@v2 - - # Установка OneScript конкретной версии - - name: Установка OneScript - uses: otymko/setup-onescript@v1.3 - with: - version: ${{ matrix.oscript_version }} - - # Установка зависимостей пакета - - name: Установка зависимостей - run: | - opm install opm - opm install - - - name: Сборка пакета - run: opm build . - - - name: Заливка артефактов - uses: actions/upload-artifact@v2 - with: - name: package.zip - path: ./${{ env.PACKAGE_MASK }} - - #- name: Заливка в релиз - # uses: AButler/upload-release-assets@v2.0.2 - # with: - # files: ./${{ env.PACKAGE_MASK }} - # repo-token: ${{ secrets.GITHUB_TOKEN }} - - - name: Публикация в hub.oscript.io - shell: bash - run: opm push -f ./${{ env.PACKAGE_MASK }} --token ${{ secrets.PUSH_TOKEN }} -c stable + release: + types: + - published + workflow_dispatch: + + jobs: + release: + uses: autumn-library/workflows/.github/workflows/release.yml@main + with: + package_mask: "autumn-*.ospx" + secrets: + PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }} diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index afc9438..f4af2e1 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - oscript_version: ['dev', 'lts-dev'] + oscript_version: ['dev', 'lts-dev', 'default'] uses: autumn-library/workflows/.github/workflows/test.yml@main with: oscript_version: ${{ matrix.oscript_version }} diff --git a/packagedef b/packagedef index 352dccf..7a75bf1 100644 --- a/packagedef +++ b/packagedef @@ -9,7 +9,7 @@ .Автор("Nikita Fedkin") .АдресАвтора("nixel2007@gmail.com") .Описание("Dependency injection framework для OneScript") - .ВерсияСреды("1.8.5") + .ВерсияСреды("1.9.0") .ВключитьФайл("src") .ВключитьФайл("tests") .ВключитьФайл("LICENSE.md")