From 50889769fafb4c2d85e6b6f8d475b83ccd65e167 Mon Sep 17 00:00:00 2001 From: ivanovEV Date: Tue, 20 Feb 2024 18:28:24 +0300 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit df9515fc67904701e1b763a1500ed70692e315f3 Merge: d79e367 0899819 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Feb 13 16:55:11 2024 +0000 Merge pull request #109 from firstBitMarksistskaya/dependabot/github_actions/actions/checkout-4 commit 08998197bdc17c8cf7e015060b9e69b011fa2e3a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Feb 13 16:53:45 2024 +0000 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] commit d79e367d323a037c214a830ec38a85b2939aa84d Merge: 1cfefc2 5bdca69 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Feb 13 16:53:11 2024 +0000 Merge pull request #108 from firstBitMarksistskaya/dependabot/github_actions/actions/setup-java-4 commit 5bdca690ce210c610024034f161ae7f9739c9460 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Feb 13 16:51:29 2024 +0000 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] commit 1cfefc24dea9332fafe5af02ee8157c593bb5e7b Author: Nikita Fedkin Date: Tue Feb 13 17:51:01 2024 +0100 Create dependabot.yml commit 3a1c9fb80c3d45f20bc0086b1e57ffb77f57b72c Merge: be33515 494f9b9 Author: Nikita Fedkin Date: Tue Feb 13 17:43:26 2024 +0100 Merge pull request #107 from ivanmolodec/file-exist-bug commit 494f9b9b138e81661544b006db49f0eab5984dc2 Merge: 8c9a702 be33515 Author: Ivan Smirnov <52702497+ivanmolodec@users.noreply.github.com> Date: Tue Feb 13 19:38:25 2024 +0300 Merge branch 'firstBitMarksistskaya:develop' into file-exist-bug commit be335151c42cfafbc9f1efe45f10fdb5cd5459c2 Author: Nikita Fedkin Date: Tue Feb 13 17:29:25 2024 +0100 Fix dependencies download commit 8c9a7028c9f8e677c975eedd462f6ea3166ddcd8 Author: Ivan Smirnov Date: Tue Feb 13 19:05:26 2024 +0300 Внесены правки в yaml файл для ci commit 7fb7fa1742d876395a7b8ed0b877972d928ce232 Author: Ivan Smirnov Date: Tue Feb 13 18:29:56 2024 +0300 Возвращено создание папки build/out commit bd943e9bcc1190305935fefadae5ee165d05926f Author: Ivan Smirnov Date: Tue Feb 13 15:07:44 2024 +0300 Добавлена проверка на существование файла 1Cv8.1CD.zip, удален дубль создания папки build/out --- .github/dependabot.yml | 11 +++++++++++ .github/workflows/gradle.yml | 12 ++++++------ build.gradle.kts | 5 +++++ vars/zipInfobase.groovy | 3 +++ 4 files changed, 25 insertions(+), 6 deletions(-) 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" diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e94b5496..1c1e5550 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -14,13 +14,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 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 diff --git a/build.gradle.kts b/build.gradle.kts index 7b6e22dd..2de8c201 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") { @@ -106,5 +110,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/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 }