From 252a59ffe374ce98c71b0c9b959e691addd38919 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 8 Nov 2023 15:02:14 +0400 Subject: [PATCH] feat: bump dependencies ``` | Package | Type | Update | Change | |---|---|---|---| | [LINBIT/drbd](https://togithub.com/LINBIT/drbd) | | patch | `9.2.5` -> `9.2.6` | | git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git | | patch | `6.1.60` -> `6.1.61` | | [opencontainers/runc](https://togithub.com/opencontainers/runc) | | patch | `v1.1.9` -> `v1.1.10` | | [tukaani-project/xz](https://togithub.com/tukaani-project/xz) | | patch | `v5.4.4` -> `v5.4.5` | ``` Signed-off-by: Andrey Smirnov --- .github/workflows/ci.yaml | 37 ++++++++++++++++++++++------- .github/workflows/slack-notify.yaml | 37 ++++++++++++++++++++++------- .github/workflows/weekly.yaml | 4 ++-- Makefile | 2 +- Pkgfile | 26 ++++++++++---------- kernel/build/config-amd64 | 2 +- kernel/build/config-arm64 | 2 +- 7 files changed, 76 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 38f06d42..67776346 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2023-11-02T16:03:57Z by kres 32170a7-dirty. +# Generated on 2023-11-08T10:54:12Z by kres latest. name: default concurrency: @@ -22,6 +22,7 @@ jobs: permissions: actions: read contents: write + issues: read packages: write pull-requests: read runs-on: @@ -29,10 +30,10 @@ jobs: - pkgs if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/')) outputs: - labels: ${{ steps.workflow-run-info.outputs.pullRequestLabels }} + labels: ${{ steps.retrieve-pr-labels.outputs.result }} services: buildkitd: - image: moby/buildkit:v0.12.2 + image: moby/buildkit:v0.12.3 options: --privileged ports: - 1234:1234 @@ -53,6 +54,17 @@ jobs: platforms: linux/arm64 driver: remote endpoint: tcp://localhost:1234 + - name: Save PR number + if: github.event_name == 'pull_request' && always() + run: | + echo ${{ github.event.number }} > pr-number.txt + - name: Upload PR number + if: github.event_name == 'pull_request' && always() + uses: actions/upload-artifact@v3 + with: + name: pr-number + path: pr-number.txt + retention-days: "1" - name: Build run: | make @@ -74,11 +86,20 @@ jobs: if: github.event_name != 'pull_request' run: | make nonfree PUSH=true - - name: Retrieve workflow info - id: workflow-run-info - uses: potiuk/get-workflow-origin@v1_5 + - name: Retrieve PR labels + id: retrieve-pr-labels + if: github.event_name == 'pull_request' && always() + uses: actions/github-script@v6 with: - token: ${{ secrets.GITHUB_TOKEN }} + retries: "3" + script: | + const resp = await github.rest.issues.get({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + }) + + return resp.data.labels - name: release-notes if: startsWith(github.ref, 'refs/tags/') run: | @@ -98,7 +119,7 @@ jobs: - default services: buildkitd: - image: moby/buildkit:v0.12.2 + image: moby/buildkit:v0.12.3 options: --privileged ports: - 1234:1234 diff --git a/.github/workflows/slack-notify.yaml b/.github/workflows/slack-notify.yaml index ef1ff0bd..558fe016 100644 --- a/.github/workflows/slack-notify.yaml +++ b/.github/workflows/slack-notify.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2023-11-02T09:53:23Z by kres 3a2980e-dirty. +# Generated on 2023-11-08T10:54:12Z by kres latest. name: slack-notify "on": @@ -15,14 +15,35 @@ jobs: runs-on: - self-hosted - generic - if: ${{ github.event.workflow_run.conclusion != 'skipped' }} + if: github.event.workflow_run.conclusion != 'skipped' steps: - - name: Retrieve Workflow Run Info - id: retrieve-workflow-run-info - uses: potiuk/get-workflow-origin@v1_5 + - name: Download PR artifact + if: github.event.workflow_run.event == 'pull_request' + uses: actions/github-script@v6 with: - sourceRunId: ${{ github.event.workflow_run.id }} - token: ${{ secrets.GITHUB_TOKEN }} + script: |- + let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({ + owner: context.repo.owner, + repo: context.repo.repo, + run_id: context.payload.workflow_run.id, + }); + let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => { + return artifact.name == "pr-number" + })[0]; + let download = await github.rest.actions.downloadArtifact({ + owner: context.repo.owner, + repo: context.repo.repo, + artifact_id: matchArtifact.id, + archive_format: 'zip', + }); + let fs = require('fs'); + fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/pr-number.zip`, Buffer.from(download.data)); + - name: Get PR number + id: get-pr-number + if: github.event.workflow_run.event == 'pull_request' + run: | + unzip pr-number.zip + echo pull_request_number=$(cat pr-number.txt) >> $GITHUB_OUTPUT - name: Slack Notify uses: slackapi/slack-github-action@v1 with: @@ -39,7 +60,7 @@ jobs: "fields": [ { "type": "mrkdwn", - "text": "${{ github.event.workflow_run.event == 'pull_request' && format('*Pull Request:* {0} (`{1}`)\n<{2}/pull/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, steps.retrieve-workflow-run-info.outputs.pullRequestNumber, github.event.workflow_run.display_title) || format('*Build:* {0} (`{1}`)\n<{2}/commit/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, github.sha, github.event.workflow_run.display_title) }}" + "text": "${{ github.event.workflow_run.event == 'pull_request' && format('*Pull Request:* {0} (`{1}`)\n<{2}/pull/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, steps.get-pr-number.outputs.pull_request_number, github.event.workflow_run.display_title) || format('*Build:* {0} (`{1}`)\n<{2}/commit/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, github.sha, github.event.workflow_run.display_title) }}" }, { "type": "mrkdwn", diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml index b9106849..69170c86 100644 --- a/.github/workflows/weekly.yaml +++ b/.github/workflows/weekly.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2023-11-02T09:53:23Z by kres 3a2980e-dirty. +# Generated on 2023-11-08T10:54:12Z by kres latest. name: weekly concurrency: @@ -16,7 +16,7 @@ jobs: - pkgs services: buildkitd: - image: moby/buildkit:v0.12.2 + image: moby/buildkit:v0.12.3 options: --privileged ports: - 1234:1234 diff --git a/Makefile b/Makefile index cd44fe6c..4a1319df 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2023-11-03T10:10:36Z by kres latest. +# Generated on 2023-11-08T12:18:58Z by kres latest. # common variables diff --git a/Pkgfile b/Pkgfile index dca887a8..3db0348b 100644 --- a/Pkgfile +++ b/Pkgfile @@ -27,9 +27,9 @@ vars: dosfstools_sha512: 3cc0808edb4432428df8a67da4bb314fd1f27adc4a05754c1a492091741a7b6875ebd9f6a509cc4c5ad85643fc40395b6e0cadee548b25cc439cc9b725980156 # renovate: datasource=github-tags extractVersion=^drbd-(?.*)$ depName=LINBIT/drbd - drbd_version: 9.2.5 - drbd_sha256: 8dcbda41f3975e7c5f84648c3c31995cc0429eb0e4cf17bfa13f76c0345badce - drbd_sha512: 874118af547b6ca3bd771becb091ee8a027d27c273ad6c0f0428f426f8a81b3a276d7e26adefd6bac1bfc2cfd807366559356f0970fdbf6e822af177330c527b + drbd_version: 9.2.6 + drbd_sha256: 25e843e561e0af01a503d91657cea4109cc7e10b422129eeb1d4ba926255a9b4 + drbd_sha512: 53a4b0ddee9b9097c03e15e3a9e48e7898b7bc0226af216eb47d2f081cde26b038d7536197c7ec8e5473643919dede8a928f4f03cc5ad8c1ab625524cb62bc05 # renovate: datasource=github-releases depName=eudev-project/eudev eudev_version: v3.2.14 @@ -68,9 +68,9 @@ vars: ipxe_sha512: 865d4ab5b7eb3435dcf291e8da046dda5a63ffe9ec35e4ea9cc83c469434c1cd0cf9818e2bb532856494637bfefcd1b017180d17edf7316866d6cd11232f9707 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git - linux_version: 6.1.60 - linux_sha256: 58520e7ae5a6af254ddf7ddbfc42e4373b0d36c67d467f6e35a3bd1672f5fb0a - linux_sha512: cef40235428a09e5f7807a8be83af9a5ab90e841049a04f9f851e69e602aeab5a50f523cae5d5928d345c11b728608eba7754b173be0c023c7ee564cfaf4b20a + linux_version: 6.1.61 + linux_sha256: ad2c9d12fc36e2dde4796a3eec8f4ddca2e278098f4e555b6e6f5f03ef6964ce + linux_sha512: cc4bc51abca165701ad0a5a13e2b4b0fe7f55a3ea1d0d709b714d490b1952058ed1ed3934554827b6edbaedf9609bc0e1aaa0bb238672e040ed47c34d3723b97 # renovate: datasource=git-tags extractVersion=^v(?.*)$ depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git kmod_version: 31 @@ -93,9 +93,9 @@ vars: libjson_c_sha512: 4cbedd559502bf9014cfcd1d0bb8bb80d2abac4e969d95d4170123cd9cbafb0756b913fdbb83f666d14f674d6539a60ed1c5d0eb03c36b8037a2e00dc1636e19 # renovate: datasource=github-releases depName=tukaani-project/xz - xz_version: v5.4.4 - xz_sha256: 705d0d96e94e1840e64dec75fc8d5832d34f6649833bec1ced9c3e08cf88132e - xz_sha512: 2b233a924b82190ff15e970c5a4a59f1c53a0b39a96bde228c9dfc9b103b4a3e5888f5024da4834e180f6010620ff23caf9f7135a38724eb2c8d01bff7a9a9e1 + xz_version: v5.4.5 + xz_sha256: da9dec6c12cf2ecf269c31ab65b5de18e8e52b96f35d5bcd08c12b43e6878803 + xz_sha512: 5cbc3b5bb35a9f5773ad657788fe77013471e3b621c5a8149deb7389d48535926e5bed103456fcfe5ecb044b236b1055b03938a6cc877cfc749372b899fc79e5 # renovate: datasource=github-releases extractVersion=^popt-(?.*)-release$ depName=rpm-software-management/popt libpopt_version: 1.19 @@ -147,10 +147,10 @@ vars: raspberrypi_firmware_sha512: ddc9baeba4e2e442bfe41e427c7ecdd38ee6d44ac4e7c297ae7d5a6c64b0aa1a81206929baeb9aceb74de6f96707b30040e82450ef4f01a78b958299c72e3857 # renovate: datasource=github-tags depName=opencontainers/runc - runc_version: v1.1.9 - runc_ref: ccaecfcbc907d70a7aa870a6650887b901b25b82 - runc_sha256: 7695febe134e17559b26224821a2a123bc9e9a637ad4a8c47e99ae0a1ec71dc2 - runc_sha512: e6fd1e7414929436f996358389eeb968db1304358029f0b845eb7d4afac4fa0d637e06ab0e564d680b825e2edb97b55cc154f32e4912d56697bbaf0923c1ec0d + runc_version: v1.1.10 + runc_ref: 18a0cb0f32bcac2ecc9a10f327d282759c144dab + runc_sha256: bd3e89ae89319ef344e7e26f392b40e344bcd5bbdea84ca459a43189451615bf + runc_sha512: bf25d5222b560428daab58d887fd867a7e4c5703004eae9dbc1a082d55ac5db961ed8e5a2ff5dafe6d6350e59afd1053b98a6fc0e8a281758b706cf9144860d3 # renovate: datasource=git-tags extractVersion=^tag-(?.*)$ depName=git://repo.or.cz/socat.git socat_version: 1.7.4.4 diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64 index 5f96ec35..170568ca 100644 --- a/kernel/build/config-amd64 +++ b/kernel/build/config-amd64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.60 Kernel Configuration +# Linux/x86 6.1.61 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64 index 34455eba..25ac60c5 100644 --- a/kernel/build/config-arm64 +++ b/kernel/build/config-arm64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.60 Kernel Configuration +# Linux/arm64 6.1.61 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y