From 72a60a59c0656eb22161702b3f5f92aadae99782 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Mon, 1 Apr 2024 11:02:41 +0200 Subject: [PATCH 01/11] Update test.yml --- .github/workflows/test.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e1f244d..6ad1bd8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,6 +31,12 @@ jobs: - name: Актуализация uses: actions/checkout@v4 + - uses: actions/cache@v4 + id: cache + with: + path: oscript_modules + key: ${{ runner.os }}-${{ hashFiles('packagedef') }} + - name: Установка свойств git shell: bash run: | @@ -56,11 +62,13 @@ jobs: with: version: ${{ steps.extract_oscript_version.outputs.version }} + - name: Обновление opm + run: opm install opm + - name: Установка зависимостей - run: | - opm install opm - opm install -l --dev - + if: steps.cache.outputs.cache-hit != 'true' + run: opm install -l --dev + - name: Установка дополнительных пакетов if: inputs.additional_oscript_packages != '' run: opm install -l ${{ inputs.additional_oscript_packages }} From dafd73b4bbb6e4021040d2298a0b98bd1827f0af Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Mon, 1 Apr 2024 11:13:54 +0200 Subject: [PATCH 02/11] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ad1bd8..a9be140 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,8 +34,8 @@ jobs: - uses: actions/cache@v4 id: cache with: - path: oscript_modules - key: ${{ runner.os }}-${{ hashFiles('packagedef') }} + path: '**/oscript_modules' + key: ${{ runner.os }}-${{ inputs.oscript_version }}-${{ hashFiles('**/packagedef') }} - name: Установка свойств git shell: bash From 666f06bd165f1236ef1c7f37018700bcf6fc2091 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Mon, 1 Apr 2024 11:24:19 +0200 Subject: [PATCH 03/11] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20|=20=D0=B2=D0=BE?= =?UTF-8?q?=20=D1=81=D0=BB=D0=B0=D0=B2=D1=83=20=D1=81=D0=BB=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20pwsh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a9be140..0d59397 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,15 +63,18 @@ jobs: version: ${{ steps.extract_oscript_version.outputs.version }} - name: Обновление opm - run: opm install opm + run: | + opm install opm - name: Установка зависимостей if: steps.cache.outputs.cache-hit != 'true' - run: opm install -l --dev + run: | + opm install -l --dev - name: Установка дополнительных пакетов if: inputs.additional_oscript_packages != '' - run: opm install -l ${{ inputs.additional_oscript_packages }} + run: | + opm install -l ${{ inputs.additional_oscript_packages }} - name: Тестирование run: oscript ${{ inputs.test_script_path}} From 5818f1f9dd076e843929b9a069f30a59c437faf7 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Mon, 1 Apr 2024 11:27:45 +0200 Subject: [PATCH 04/11] Update test.yml --- .github/workflows/test.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0d59397..36281c4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,18 +63,16 @@ jobs: version: ${{ steps.extract_oscript_version.outputs.version }} - name: Обновление opm - run: | - opm install opm + shell: bash + run: opm install opm - name: Установка зависимостей if: steps.cache.outputs.cache-hit != 'true' - run: | - opm install -l --dev + run: opm install -l --dev - name: Установка дополнительных пакетов if: inputs.additional_oscript_packages != '' - run: | - opm install -l ${{ inputs.additional_oscript_packages }} + run: opm install -l ${{ inputs.additional_oscript_packages }} - name: Тестирование run: oscript ${{ inputs.test_script_path}} From 49a2ed521ecaccd066cb9fa4c87bbb16694394c5 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Mon, 1 Apr 2024 11:29:53 +0200 Subject: [PATCH 05/11] Update test.yml --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 36281c4..a9be140 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,7 +63,6 @@ jobs: version: ${{ steps.extract_oscript_version.outputs.version }} - name: Обновление opm - shell: bash run: opm install opm - name: Установка зависимостей From 31c3def13db5dc2de1164422317dd8671a8f2341 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Mon, 1 Apr 2024 11:43:31 +0200 Subject: [PATCH 06/11] Update test.yml --- .github/workflows/test.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a9be140..790bfe3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -62,7 +62,13 @@ jobs: with: version: ${{ steps.extract_oscript_version.outputs.version }} - - name: Обновление opm + - name: Обновление opm (win) + if: runner.os == 'windows-latest' + shell: cmd + run: opm install opm + + - name: Обновление opm (*nix) + if: runner.os != 'windows-latest' run: opm install opm - name: Установка зависимостей From c8369b46e9fb188e9c8ba3976ad1eea950e9ab16 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Mon, 1 Apr 2024 11:47:06 +0200 Subject: [PATCH 07/11] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 790bfe3..2d3b15b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,12 +63,12 @@ jobs: version: ${{ steps.extract_oscript_version.outputs.version }} - name: Обновление opm (win) - if: runner.os == 'windows-latest' + if: matrix.os == 'windows-latest' shell: cmd run: opm install opm - name: Обновление opm (*nix) - if: runner.os != 'windows-latest' + if: matrix.os != 'windows-latest' run: opm install opm - name: Установка зависимостей From 4066fed3b3d1a4436aec613bbe3ffeef3e24cdd2 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Mon, 1 Apr 2024 11:49:02 +0200 Subject: [PATCH 08/11] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2d3b15b..17ea78d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,12 +63,12 @@ jobs: version: ${{ steps.extract_oscript_version.outputs.version }} - name: Обновление opm (win) - if: matrix.os == 'windows-latest' + if: runner.os == 'Windows' shell: cmd run: opm install opm - name: Обновление opm (*nix) - if: matrix.os != 'windows-latest' + if: runner.os != 'Windows' run: opm install opm - name: Установка зависимостей From 5f37d6374c196f25143611a1e158c4ecc5a92f58 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Fri, 5 Apr 2024 20:01:43 +0200 Subject: [PATCH 09/11] Update test.yml --- .github/workflows/test.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 17ea78d..5c0714e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,13 +63,9 @@ jobs: version: ${{ steps.extract_oscript_version.outputs.version }} - name: Обновление opm (win) - if: runner.os == 'Windows' - shell: cmd - run: opm install opm - - - name: Обновление opm (*nix) - if: runner.os != 'Windows' - run: opm install opm + run: | + opm install opm + echo "" - name: Установка зависимостей if: steps.cache.outputs.cache-hit != 'true' From fb1fecd363b592daeaf1cd05d79ae01230d28a1d Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 6 Apr 2024 11:53:16 +0200 Subject: [PATCH 10/11] Update test.yml --- .github/workflows/test.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5c0714e..d23e82d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,9 +63,12 @@ jobs: version: ${{ steps.extract_oscript_version.outputs.version }} - name: Обновление opm (win) - run: | - opm install opm - echo "" + if: runner.os == 'Windows' + run: call opm install opm + + - name: Обновление opm (*nix) + if: runner.os != 'Windows' + run: opm install opm - name: Установка зависимостей if: steps.cache.outputs.cache-hit != 'true' From 7601f85a04c3592461b575c45c195a74dc987d24 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Sat, 6 Apr 2024 11:56:11 +0200 Subject: [PATCH 11/11] Update test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d23e82d..57580d9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -64,6 +64,7 @@ jobs: - name: Обновление opm (win) if: runner.os == 'Windows' + shell: cmd run: call opm install opm - name: Обновление opm (*nix)