From bd943e9bcc1190305935fefadae5ee165d05926f Mon Sep 17 00:00:00 2001 From: Ivan Smirnov Date: Tue, 13 Feb 2024 15:07:44 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=81=D1=83=D1=89=D0=B5=D1=81=D1=82=D0=B2?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B0=D0=B9=D0=BB?= =?UTF-8?q?=D0=B0=201Cv8.1CD.zip,=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=20=D0=B4=D1=83=D0=B1=D0=BB=D1=8C=20=D1=81=D0=BE=D0=B7=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B8=20bui?= =?UTF-8?q?ld/out?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 1 + vars/pipeline1C.groovy | 1 - vars/zipInfobase.groovy | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 14f2850e..f88f956e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -106,5 +106,6 @@ sharedLibrary { dependency("org.jenkinsci.plugins", "pipeline-model-definition", declarativePluginsVersion) dependency("org.jenkinsci.plugins", "pipeline-model-extensions", declarativePluginsVersion) dependency("io.jenkins.blueocean", "blueocean-pipeline-api-impl", "1.25.3") + dependency("sp.sd", "file-operations", "214.v2e7dc7f25757") } } diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy index 89faa801..3828ab38 100644 --- a/vars/pipeline1C.groovy +++ b/vars/pipeline1C.groovy @@ -79,7 +79,6 @@ void call() { stage('Создание ИБ') { steps { timeout(time: config.timeoutOptions.createInfoBase, unit: TimeUnit.MINUTES) { - createDir('build/out') script { if (config.infoBaseFromFiles()) { diff --git a/vars/zipInfobase.groovy b/vars/zipInfobase.groovy index 74004bb5..14bc94ae 100644 --- a/vars/zipInfobase.groovy +++ b/vars/zipInfobase.groovy @@ -1,4 +1,7 @@ def call() { + if (fileExists('1Cv8.1CD.zip')) { + fileOperations([fileDeleteOperation(includes: '1Cv8.1CD.zip')]) + } zip dir: 'build/ib', glob: '1Cv8.1CD', zipFile: '1Cv8.1CD.zip' stash name: "1Cv8.1CD.zip", includes: "1Cv8.1CD.zip", allowEmpty: false } From 7fb7fa1742d876395a7b8ed0b877972d928ce232 Mon Sep 17 00:00:00 2001 From: Ivan Smirnov Date: Tue, 13 Feb 2024 18:29:56 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=92=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B8=20build/out?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vars/pipeline1C.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy index 3828ab38..89faa801 100644 --- a/vars/pipeline1C.groovy +++ b/vars/pipeline1C.groovy @@ -79,6 +79,7 @@ void call() { stage('Создание ИБ') { steps { timeout(time: config.timeoutOptions.createInfoBase, unit: TimeUnit.MINUTES) { + createDir('build/out') script { if (config.infoBaseFromFiles()) { From 8c9a7028c9f8e677c975eedd462f6ea3166ddcd8 Mon Sep 17 00:00:00 2001 From: Ivan Smirnov Date: Tue, 13 Feb 2024 19:05:26 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=92=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D1=8B?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2=20yaml=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=20=D0=B4=D0=BB=D1=8F=20ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e94b5496..90bcbf92 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -20,7 +20,7 @@ jobs: with: java-version: '11' distribution: 'temurin' - - name: Build with Gradle - uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 - with: - arguments: check + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + - name: Execute Gradle build + run: ./gradlew check From be335151c42cfafbc9f1efe45f10fdb5cd5459c2 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Tue, 13 Feb 2024 17:29:25 +0100 Subject: [PATCH 4/8] Fix dependencies download --- build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 14f2850e..42dae743 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,6 +9,10 @@ plugins { id("org.jenkins-ci.jpi") version "0.38.0" apply false } +repositories { + mavenCentral() +} + tasks { register("resolveIntegrationTestDependencies") { From 1cfefc24dea9332fafe5af02ee8157c593bb5e7b Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Tue, 13 Feb 2024 17:51:01 +0100 Subject: [PATCH 5/8] Create dependabot.yml --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..0d08e261 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "github-actions" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" From 5bdca690ce210c610024034f161ae7f9739c9460 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 16:51:29 +0000 Subject: [PATCH 6/8] Bump actions/setup-java from 3 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 90bcbf92..f1a722b6 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'temurin' From 08998197bdc17c8cf7e015060b9e69b011fa2e3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 16:53:45 +0000 Subject: [PATCH 7/8] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f1a722b6..1c1e5550 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 uses: actions/setup-java@v4 with: From 9494cdb02bc0b910ecf97955a46137e44bff5435 Mon Sep 17 00:00:00 2001 From: Ivan Smirnov Date: Wed, 14 Feb 2024 20:06:53 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B5=20FilePath=20=D0=B2=20deleteDir()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../library/steps/DesignerToEdtFormatTransformation.groovy | 2 +- .../library/steps/EdtToDesignerFormatTransformation.groovy | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy index 8ff00731..1f32ecaf 100644 --- a/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy +++ b/src/ru/pulsar/jenkins/library/steps/DesignerToEdtFormatTransformation.groovy @@ -39,7 +39,7 @@ class DesignerToEdtFormatTransformation implements Serializable { def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$srcDir") def edtVersionForRing = EDT.ringModule(config) - steps.deleteDir(workspaceDir) + steps.deleteDir(workspaceDir.getRemote()) Logger.println("Конвертация исходников из формата конфигуратора в формат EDT") diff --git a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy index f80acf22..498f4ff0 100644 --- a/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy +++ b/src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy @@ -41,8 +41,8 @@ class EdtToDesignerFormatTransformation implements Serializable { def configurationRoot = FileUtils.getFilePath("$env.WORKSPACE/$CONFIGURATION_DIR") def edtVersionForRing = EDT.ringModule(config) - steps.deleteDir(workspaceDir) - steps.deleteDir(configurationRoot) + steps.deleteDir(workspaceDir.getRemote()) + steps.deleteDir(configurationRoot.getRemote()) Logger.println("Конвертация исходников из формата EDT в формат Конфигуратора")