Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit df9515f
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 firstBitMarksistskaya#109 from firstBitMarksistskaya/dependabot/github_actions/actions/checkout-4

commit 0899819
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](actions/checkout@v3...v4)

    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit d79e367
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 firstBitMarksistskaya#108 from firstBitMarksistskaya/dependabot/github_actions/actions/setup-java-4

commit 5bdca69
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](actions/setup-java@v3...v4)

    ---
    updated-dependencies:
    - dependency-name: actions/setup-java
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

commit 1cfefc2
Author: Nikita Fedkin <[email protected]>
Date:   Tue Feb 13 17:51:01 2024 +0100

    Create dependabot.yml

commit 3a1c9fb
Merge: be33515 494f9b9
Author: Nikita Fedkin <[email protected]>
Date:   Tue Feb 13 17:43:26 2024 +0100

    Merge pull request firstBitMarksistskaya#107 from ivanmolodec/file-exist-bug

commit 494f9b9
Merge: 8c9a702 be33515
Author: Ivan Smirnov <[email protected]>
Date:   Tue Feb 13 19:38:25 2024 +0300

    Merge branch 'firstBitMarksistskaya:develop' into file-exist-bug

commit be33515
Author: Nikita Fedkin <[email protected]>
Date:   Tue Feb 13 17:29:25 2024 +0100

    Fix dependencies download

commit 8c9a702
Author: Ivan Smirnov <[email protected]>
Date:   Tue Feb 13 19:05:26 2024 +0300

    Внесены правки в yaml файл для ci

commit 7fb7fa1
Author: Ivan Smirnov <[email protected]>
Date:   Tue Feb 13 18:29:56 2024 +0300

    Возвращено создание папки build/out

commit bd943e9
Author: Ivan Smirnov <[email protected]>
Date:   Tue Feb 13 15:07:44 2024 +0300

    Добавлена проверка на существование файла 1Cv8.1CD.zip, удален дубль создания папки build/out
  • Loading branch information
ivanovEV committed Feb 20, 2024
1 parent 9f279c0 commit 5088976
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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"
12 changes: 6 additions & 6 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ plugins {
id("org.jenkins-ci.jpi") version "0.38.0" apply false
}

repositories {
mavenCentral()
}

tasks {

register<org.jenkinsci.gradle.plugins.jpi.TestDependenciesTask>("resolveIntegrationTestDependencies") {
Expand Down Expand Up @@ -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")
}
}
3 changes: 3 additions & 0 deletions vars/zipInfobase.groovy
Original file line number Diff line number Diff line change
@@ -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
}

0 comments on commit 5088976

Please sign in to comment.