Skip to content

Commit 6492091

Browse files
committed
Синхронизировано с веткой master
2 parents 9983617 + 5c64af4 commit 6492091

File tree

4 files changed

+30
-5
lines changed

4 files changed

+30
-5
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-latest, windows-latest, macos-latest]
17-
oscript_version: ['1.2.0', 'dev', 'stable']
17+
oscript_version: ['stable', '1.8.4']
1818

1919
steps:
2020
- uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Install dependencies
2828
run: |
29-
opm install opm@1.0.2
29+
opm install opm
3030
opm install 1testrunner;
3131
opm install 1bdd;
3232
opm install coverage;
@@ -40,7 +40,7 @@ jobs:
4040
oscript ./tasks/coverage.os
4141
4242
- name: SonarCloud Scan on push
43-
if: github.repository == 'oscript-library/opm' && github.event_name == 'push' && matrix.os == 'ubuntu-latest' && matrix.oscript_version == 'dev'
43+
if: github.repository == 'oscript-library/opm' && github.event_name == 'push' && matrix.os == 'ubuntu-latest' && matrix.oscript_version == 'stable'
4444
uses: nixel2007/sonarcloud-github-action@v1.4
4545
env:
4646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -51,7 +51,7 @@ jobs:
5151
-Dsonar.branch.name=${{ env.BRANCH_NAME }}
5252
5353
- name: SonarCloud Scan on PR
54-
if: github.repository == 'oscript-library/opm' && github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest' && matrix.oscript_version == 'dev'
54+
if: github.repository == 'oscript-library/opm' && github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest' && matrix.oscript_version == 'stable'
5555
uses: nixel2007/sonarcloud-github-action@v1.4
5656
env:
5757
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/rebase.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Automatic Rebase
2+
on:
3+
issue_comment:
4+
types: [created]
5+
jobs:
6+
rebase:
7+
name: Rebase
8+
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout the latest code
12+
uses: actions/checkout@v4
13+
with:
14+
token: ${{ secrets.GITHUB_TOKEN }}
15+
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
16+
- name: Automatic Rebase
17+
uses: cirrus-actions/rebase@1.8
18+
env:
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,9 @@ opm update -all
7171
- windows: ```c:\ProgramData\opm.cfg```
7272
- OSCRIPT/lib/opm/opm.cfg - каталог установки opm, для совместимости.
7373

74+
## Обновление
75+
76+
Пакетный менеджер обновляется вместе с oscript'ом, необходимую версию которого можно вручную скачать со страницы https://oscript.io/downloads/ или через [ovm](https://github.com/oscript-library/ovm), или обновить opm через сам opm:
77+
```
78+
opm update opm
79+
```

packagedef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
Описание.Имя("opm")
2020
.Версия(ВерсияПродукта)
21-
.ВерсияСреды("1.0.19")
21+
.ВерсияСреды("1.8.3")
2222
.ЗависитОт("fs", "1.2.0")
2323
.ЗависитОт("asserts", "1.3.0")
2424
.ЗависитОт("fluent", "0.4.0")

0 commit comments

Comments
 (0)