From 2a7a2e9f003606d5b8d50e9c2fbcb6d9ddf3905f Mon Sep 17 00:00:00 2001 From: Maxwell <mburumaxwell@gmail.com> Date: Thu, 28 Sep 2023 09:04:40 +0300 Subject: [PATCH] Test for PNPM fix --- .github/workflows/codeql.yml | 2 +- .github/workflows/updater.yml | 14 -------- updater/Gemfile | 3 +- updater/Gemfile.lock | 62 +++++++++++++++++++---------------- 4 files changed, 37 insertions(+), 44 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 9f138b37a..039c3a379 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'javascript', 'ruby', 'csharp' ] + language: [ 'ruby' ] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] # Use only 'java' to analyze code written in Java, Kotlin or both # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 9b47dbc55..1196afb0a 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -102,21 +102,7 @@ jobs: . - name: Log into registry - if: ${{ (github.ref == 'refs/heads/main') || (!startsWith(github.ref, 'refs/pull')) || startsWith(github.ref, 'refs/tags') }} run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin - - name: Push image (latest, ShortSha) - if: ${{ (github.ref == 'refs/heads/main') || startsWith(github.ref, 'refs/tags') }} - run: | - docker push "ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:latest" - docker push "ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:$GITVERSION_SHORTSHA" - - name: Push image (NuGetVersionV2) - if: ${{ !startsWith(github.ref, 'refs/pull') }} run: docker push "ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:$GITVERSION_NUGETVERSIONV2" - - - name: Push image (major, minor) - if: startsWith(github.ref, 'refs/tags') - run: | - docker push "ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:$GITVERSION_MAJOR.$GITVERSION_MINOR" - docker push "ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:$GITVERSION_MAJOR" diff --git a/updater/Gemfile b/updater/Gemfile index 471916c2a..d2ce7eaa4 100644 --- a/updater/Gemfile +++ b/updater/Gemfile @@ -10,7 +10,8 @@ source "https://rubygems.org" # gem "dependabot-omnibus", github: "dependabot/dependabot-core", branch: "main" # gem "dependabot-omnibus", github: "dependabot/dependabot-core", tag: "v0.232.0" -gem "dependabot-omnibus", "~>0.232.0" +gem "dependabot-omnibus", github: "dependabot/dependabot-core", ref: "a4e8046" +# gem "dependabot-omnibus", "~>0.232.0" gem "http", "~> 5.1" gem "octokit", "6.1.1" diff --git a/updater/Gemfile.lock b/updater/Gemfile.lock index 9a47a29a3..f0be7f0ee 100644 --- a/updater/Gemfile.lock +++ b/updater/Gemfile.lock @@ -1,29 +1,8 @@ -GEM - remote: https://rubygems.org/ +GIT + remote: https://github.com/dependabot/dependabot-core.git + revision: a4e80463f850136df95b14603e0dcf6233c29629 + ref: a4e8046 specs: - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) - ast (2.4.2) - aws-eventstream (1.2.0) - aws-partitions (1.822.0) - aws-sdk-codecommit (1.59.0) - aws-sdk-core (~> 3, >= 3.177.0) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.181.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) - jmespath (~> 1, >= 1.6.1) - aws-sdk-ecr (1.64.0) - aws-sdk-core (~> 3, >= 3.177.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.6.0) - aws-eventstream (~> 1, >= 1.0.2) - base64 (0.1.1) - citrus (3.0.2) - commonmarker (0.23.10) - crack (0.4.5) - rexml dependabot-bundler (0.232.0) dependabot-common (= 0.232.0) dependabot-cargo (0.232.0) @@ -42,7 +21,7 @@ GEM octokit (>= 4.6, < 7.0) parser (>= 2.5, < 4.0) psych (~> 5.0) - sorbet-runtime (~> 0.5) + sorbet-runtime (~> 0.5.11026) toml-rb (>= 1.1.2, < 3.0) dependabot-composer (0.232.0) dependabot-common (= 0.232.0) @@ -95,6 +74,33 @@ GEM dependabot-common (= 0.232.0) dependabot-terraform (0.232.0) dependabot-common (= 0.232.0) + +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + ast (2.4.2) + aws-eventstream (1.2.0) + aws-partitions (1.829.0) + aws-sdk-codecommit (1.60.0) + aws-sdk-core (~> 3, >= 3.184.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.184.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-ecr (1.65.0) + aws-sdk-core (~> 3, >= 3.184.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.6.0) + aws-eventstream (~> 1, >= 1.0.2) + base64 (0.1.1) + citrus (3.0.2) + commonmarker (0.23.10) + crack (0.4.5) + rexml diff-lcs (1.5.0) docker_registry2 (1.18.0) rest-client (>= 1.8.0) @@ -203,7 +209,7 @@ GEM faraday (>= 0.17.3, < 3) sentry-raven (3.1.2) faraday (>= 1.0) - sorbet-runtime (0.5.11014) + sorbet-runtime (0.5.11044) stringio (3.0.8) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -225,7 +231,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - dependabot-omnibus (~> 0.232.0) + dependabot-omnibus! http (~> 5.1) octokit (= 6.1.1) rspec