From 482fc3e4f6660fba71e766b1f3ebc8bcc8e6571c Mon Sep 17 00:00:00 2001 From: Suhodolets Ilya Date: Sun, 15 Dec 2024 21:15:55 +0300 Subject: [PATCH 1/3] ci: up ver runner image --- .github/workflows/all.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index cfab1b0c479..c6d7351e93c 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -25,7 +25,7 @@ defaults: jobs: lint_commits: name: All - lint_commits - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 # We assume that commit 2fd0d36fe6ae0c2d527368683ec3a6352617b381 will be in the history # of all commits based on ockam develop branch @@ -43,7 +43,7 @@ jobs: lint_editorconfig: name: All - lint_editorconfig - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: # gitlab.com/greut/eclint image: greut/eclint:v0.3.3@sha256:95e9a3dcbd236bae6569625cd403175cbde3705303774e7baca418b6442b8d77 steps: @@ -57,7 +57,7 @@ jobs: # https://github.com/returntocorp/semgrep lint_semgrep: name: All - lint_semgrep - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: image: returntocorp/semgrep@sha256:2fd35fa409f209e0fea0c2d72cf1e5b801a607959a93b13d04822bb3b6a9dfe4 steps: @@ -75,7 +75,7 @@ jobs: # Check notice file for update notice_update: name: All - notice_update - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Install Nix uses: DeterminateSystems/nix-installer-action@e50d5f73bfe71c2dd0aa4218de8f4afa59f8f81d From 81ef229e2d5b021e424f7f8308c1ea1301f2ccd7 Mon Sep 17 00:00:00 2001 From: Suhodolets Ilya Date: Sun, 15 Dec 2024 21:28:19 +0300 Subject: [PATCH 2/3] ci: up ver image in all config --- .github/workflows/distroless.yml | 2 +- .github/workflows/ockam-artifact.yml | 2 +- .github/workflows/ockam-healthcheck.yml | 2 +- .../workflows/release-bump-pull-request.yml | 2 +- .github/workflows/release-draft-binaries.yml | 10 +++---- .github/workflows/release-ockam-package.yml | 4 +-- .github/workflows/release-publish-crates.yml | 2 +- .github/workflows/rust-ignored.yml | 28 +++++++++---------- .github/workflows/scorecards.yml | 2 +- .github/workflows/shell-ignored.yml | 4 +-- .github/workflows/shell.yml | 4 +-- .github/workflows/typos.yml | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/distroless.yml b/.github/workflows/distroless.yml index dca69ccfdbb..cd89c2097a9 100644 --- a/.github/workflows/distroless.yml +++ b/.github/workflows/distroless.yml @@ -25,7 +25,7 @@ env: jobs: build_base_image: name: "Build Ockam Distroless Base Image" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 permissions: packages: write environment: release diff --git a/.github/workflows/ockam-artifact.yml b/.github/workflows/ockam-artifact.yml index 0e86024e946..1be1c33f032 100644 --- a/.github/workflows/ockam-artifact.yml +++ b/.github/workflows/ockam-artifact.yml @@ -14,7 +14,7 @@ env: ORGANIZATION: ${{ github.repository_owner }} jobs: build_artifact: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 permissions: packages: write defaults: diff --git a/.github/workflows/ockam-healthcheck.yml b/.github/workflows/ockam-healthcheck.yml index 56542e06ddd..f1d17203b7c 100644 --- a/.github/workflows/ockam-healthcheck.yml +++ b/.github/workflows/ockam-healthcheck.yml @@ -28,7 +28,7 @@ defaults: jobs: build_ockam_healthcheck: name: "Build And Publish Ockam Healthcheck Container" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 permissions: packages: write environment: release diff --git a/.github/workflows/release-bump-pull-request.yml b/.github/workflows/release-bump-pull-request.yml index 1f92e58e5c8..06b2cb955a7 100644 --- a/.github/workflows/release-bump-pull-request.yml +++ b/.github/workflows/release-bump-pull-request.yml @@ -48,7 +48,7 @@ jobs: pull-requests: write name: Bump Crates And Create PR - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: release container: # Note: Do not update this image has it has installed all binaries diff --git a/.github/workflows/release-draft-binaries.yml b/.github/workflows/release-draft-binaries.yml index f018cce214d..82ae233418e 100644 --- a/.github/workflows/release-draft-binaries.yml +++ b/.github/workflows/release-draft-binaries.yml @@ -23,7 +23,7 @@ jobs: contents: write name: Initiate Draft Release - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: release outputs: upload_url: ${{ steps.release_upload_url.outputs.upload_url }} @@ -325,8 +325,8 @@ jobs: fail-fast: false matrix: job: - - { target: aarch64-unknown-linux-gnu , os: ubuntu-20.04 , use-cross: true } - - { target: x86_64-unknown-linux-gnu , os: ubuntu-20.04 } + - { target: aarch64-unknown-linux-gnu , os: ubuntu-22.04 , use-cross: true } + - { target: x86_64-unknown-linux-gnu , os: ubuntu-22.04 } - { target: aarch64-apple-darwin , os: macos-14 } - { target: x86_64-apple-darwin , os: macos-14 } @@ -348,7 +348,7 @@ jobs: run: cargo install --version 0.2.4 cross - shell: bash - if: matrix.job.target == 'ubuntu-20.04' + if: matrix.job.target == 'ubuntu-22.04' run: | set -x use_cross_build=${{ matrix.job.use-cross }} @@ -430,7 +430,7 @@ jobs: sign_release: name: Sign All Assets needs: [build_release, create_release, build_elixir_nifs] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: release permissions: contents: write diff --git a/.github/workflows/release-ockam-package.yml b/.github/workflows/release-ockam-package.yml index 6285a99b523..31f8976c3ac 100644 --- a/.github/workflows/release-ockam-package.yml +++ b/.github/workflows/release-ockam-package.yml @@ -32,7 +32,7 @@ jobs: build-and-publish-artifact: if: github.event.inputs.is_release == 'false' name: "Build And Publish Ockam Container As Draft" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: release permissions: actions: read @@ -114,7 +114,7 @@ jobs: make-latest: if: github.event.inputs.is_release == 'true' name: "Make Draft Release Latest" - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: release permissions: packages: write diff --git a/.github/workflows/release-publish-crates.yml b/.github/workflows/release-publish-crates.yml index cd7365312f6..31aedf5f7e4 100644 --- a/.github/workflows/release-publish-crates.yml +++ b/.github/workflows/release-publish-crates.yml @@ -27,7 +27,7 @@ defaults: jobs: publish_crates: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 container: # Note: Do not update this image has it has installed all binaries # to bump crates and generate changelogs which we don't want installed diff --git a/.github/workflows/rust-ignored.yml b/.github/workflows/rust-ignored.yml index e1a4f831315..ef61061c962 100644 --- a/.github/workflows/rust-ignored.yml +++ b/.github/workflows/rust-ignored.yml @@ -18,79 +18,79 @@ on: jobs: lint-cargo-toml: name: Rust - lint-cargo-toml - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - lint-cargo-toml"' lint_cargo_fmt_check: name: Rust - lint_cargo_fmt_check - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - lint_cargo_fmt_check - Ignored"' lint_cargo_clippy: name: Rust - lint_cargo_clippy - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - lint_cargo_clippy - Ignored"' lint_cargo_deny: name: Rust - lint_cargo_deny - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - lint_cargo_deny - Ignored"' build_docs: name: Rust - build_docs - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - build_docs - Ignored"' build: name: Rust - build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - build - Ignored"' build_examples: name: Rust - build_examples - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - build_examples - Ignored"' test: name: Rust - test - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - test - Ignored"' check_no_std: name: Rust - check_no_std - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - check_no_std - Ignored"' check_cargo_update: name: Rust - check_cargo_update - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - check_cargo_update - Ignored"' check_nightly: name: Rust - check_nightly - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - check_nightly - Ignored"' build_nightly: name: Rust - build_nightly - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - build_nightly - Ignored"' test_nightly: name: Rust - test_nightly - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Rust - test_nightly - Ignored"' @@ -101,7 +101,7 @@ jobs: build: [linux_86] include: - build: linux_86 - os: ubuntu-20.04 + os: ubuntu-22.04 runs-on: ${{ matrix.os }} steps: - run: 'echo "Rust - lint_cargo_lock - Ignored"' diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index d93a47d397c..dc0d9d823ce 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -15,7 +15,7 @@ on: jobs: analyze: name: OSSF Scorecards - analyze - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 permissions: actions: read contents: read diff --git a/.github/workflows/shell-ignored.yml b/.github/workflows/shell-ignored.yml index 0d12482d4bc..3fba2833c20 100644 --- a/.github/workflows/shell-ignored.yml +++ b/.github/workflows/shell-ignored.yml @@ -13,12 +13,12 @@ on: jobs: lint_shellcheck: name: Shell - lint_shellcheck - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Shell - lint_shellcheck - Ignored"' lint_shfmt: name: Shell - lint_shfmt - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - run: 'echo "Shell - lint_shfmt - Ignored"' diff --git a/.github/workflows/shell.yml b/.github/workflows/shell.yml index 9c1cfdfc6a1..aea470c699e 100644 --- a/.github/workflows/shell.yml +++ b/.github/workflows/shell.yml @@ -45,7 +45,7 @@ jobs: # https://github.com/koalaman/shellcheck lint_shellcheck: name: Shell - lint_shellcheck - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: @@ -56,7 +56,7 @@ jobs: # https://github.com/mvdan/sh#shfmt lint_shfmt: name: Shell - lint_shfmt - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml index 95ce184f39c..ae9b05bac23 100644 --- a/.github/workflows/typos.yml +++ b/.github/workflows/typos.yml @@ -7,7 +7,7 @@ permissions: jobs: run: name: Spell check with Typos - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout Actions Repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 From ed2054a951e205357d7d18b0b4b3f9daa13380f7 Mon Sep 17 00:00:00 2001 From: Suhodolets Ilya Date: Tue, 17 Dec 2024 20:31:06 +0300 Subject: [PATCH 3/3] update contributors list --- .github/CONTRIBUTORS.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CONTRIBUTORS.csv b/.github/CONTRIBUTORS.csv index fc16e5badfc..0b0e6ee06cc 100644 --- a/.github/CONTRIBUTORS.csv +++ b/.github/CONTRIBUTORS.csv @@ -362,3 +362,4 @@ yes,PsychoPunkSage,Abhinav Prakash, <95116715+Psyc yes,Nathy-bajo, Nathaniel Bajo, yes,ivor11,Ivor Dsouza, <138492857+ivor11@users.noreply.github.com> yes,omahs,Omahs,<73983677+omahs@users.noreply.github.com> +yes,ilyaaay,Ilya Suhodolets,