From 70ed1cc126b55bd13fd1ab468e15ee837b4a9f0c Mon Sep 17 00:00:00 2001 From: Ben van B <030@users.noreply.github.com> Date: Sun, 4 Feb 2024 11:38:35 +0100 Subject: [PATCH] build: [#467] Resolve 'GLIBC_2.34 not found in snapcraft' issue. (#468) --- .github/workflows/snapcraft.yml | 3 +++ Taskfile.yml | 2 +- build/package/snap/snapcraft.yaml | 8 ++++++-- docs/CHANGELOG.md | 13 ++++++++++--- docs/quickstarts/snippets/n3dr/DOWNLOAD.md | 6 +++--- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.github/workflows/snapcraft.yml b/.github/workflows/snapcraft.yml index 20d6b318..edb20614 100644 --- a/.github/workflows/snapcraft.yml +++ b/.github/workflows/snapcraft.yml @@ -19,6 +19,9 @@ jobs: path: build/package id: snapcraft - run: | + snap --version + echo "check ldd version" + ldd --version sudo snap install --dangerous ${{ steps.snapcraft.outputs.snap }} n3dr --version | grep "[0-9]\." - uses: snapcore/action-publish@v1.2.0 diff --git a/Taskfile.yml b/Taskfile.yml index 9e117a3c..d5371dd5 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -4,7 +4,7 @@ version: '3' env: GIT_CHGLOG_URL: https://github.com/git-chglog/git-chglog/releases/download GIT_CHGLOG_VERSION: v0.15.1/git-chglog_0.15.1_linux_amd64.tar.gz - CHANGELOG_NEXT_TAG: 7.4.0 + CHANGELOG_NEXT_TAG: 7.4.1 tasks: changelog: diff --git a/build/package/snap/snapcraft.yaml b/build/package/snap/snapcraft.yaml index 79790c06..3cc378c3 100644 --- a/build/package/snap/snapcraft.yaml +++ b/build/package/snap/snapcraft.yaml @@ -1,7 +1,7 @@ --- name: n3dr -base: core20 -version: 7.4.0 +base: core22 +version: 7.4.1 summary: Nexus3 Disaster Recovery description: | Download all artifacts at once or migrate automatically from Nexus to Nexus. @@ -20,7 +20,11 @@ parts: plugin: nil build-packages: - curl + - libc6-dev override-build: | + snap --version + echo "check ldd version" + ldd --version cd $SNAPCRAFT_PART_INSTALL export N3DR_URL=https://github.com/030/n3dr/releases/download export N3DR_URL_VERSION=${N3DR_URL}/${SNAPCRAFT_PROJECT_VERSION} diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 657fb184..a87014f1 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,8 +2,14 @@ ## [Unreleased] + +## [7.4.1] - 2024-02-04 +### Build +- Resolve 'GLIBC_2.34 not found in snapcraft' issue. + + -## [7.4.0] - 2024-02-03 +## [7.4.0] - 2024-02-04 ### Build - [[#423](https://github.com/030/n3dr/issues/423)] Add golang action. ([#424](https://github.com/030/n3dr/issues/424)) - Replace separate hadolint, dockle and trivy by one workflow. ([#417](https://github.com/030/n3dr/issues/417)) @@ -32,7 +38,7 @@ - **deps:** bump alpine from 3.18.4 to 3.18.5 ([#387](https://github.com/030/n3dr/issues/387)) ### Feat -- [[#440](https://github.com/030/n3dr/issues/440)] Create user and assign roles. +- [[#440](https://github.com/030/n3dr/issues/440)] Create user and assign roles. ([#447](https://github.com/030/n3dr/issues/447)) ### Fix - [[#428](https://github.com/030/n3dr/issues/428)] Resolve race condition. ([#435](https://github.com/030/n3dr/issues/435)) @@ -454,7 +460,8 @@ The `backup`, `upload` and `repositories` commands have been removed. ## 1.0.0 - 2019-05-12 -[Unreleased]: https://github.com/030/n3dr/compare/7.4.0...HEAD +[Unreleased]: https://github.com/030/n3dr/compare/7.4.1...HEAD +[7.4.1]: https://github.com/030/n3dr/compare/7.4.0...7.4.1 [7.4.0]: https://github.com/030/n3dr/compare/7.3.3...7.4.0 [7.3.3]: https://github.com/030/n3dr/compare/7.3.2...7.3.3 [7.3.2]: https://github.com/030/n3dr/compare/7.3.1...7.3.2 diff --git a/docs/quickstarts/snippets/n3dr/DOWNLOAD.md b/docs/quickstarts/snippets/n3dr/DOWNLOAD.md index 3d69548b..798a4790 100644 --- a/docs/quickstarts/snippets/n3dr/DOWNLOAD.md +++ b/docs/quickstarts/snippets/n3dr/DOWNLOAD.md @@ -1,12 +1,12 @@ # Download -Download the [latest N3DR binary](https://github.com/030/n3dr/releases/tag/7.4.0): +Download the [latest N3DR binary](https://github.com/030/n3dr/releases/tag/7.4.1): ```bash cd /tmp && \ -curl -L https://github.com/030/n3dr/releases/download/7.4.0/n3dr-ubuntu-latest \ +curl -L https://github.com/030/n3dr/releases/download/7.4.1/n3dr-ubuntu-latest \ -o n3dr-ubuntu-latest && \ -curl -L https://github.com/030/n3dr/releases/download/7.4.0/\ +curl -L https://github.com/030/n3dr/releases/download/7.4.1/\ n3dr-ubuntu-latest.sha512.txt \ -o n3dr-ubuntu-latest.sha512.txt && \ sha512sum -c n3dr-ubuntu-latest.sha512.txt && \