From 3ebff450b2488a2b1a0a6e793abe6242052bea44 Mon Sep 17 00:00:00 2001 From: jok325 Date: Tue, 28 Apr 2020 23:24:40 +0200 Subject: [PATCH 1/2] Removed the version header from armored messages. Issue #871 --- src/librepgp/stream-armor.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/librepgp/stream-armor.cpp b/src/librepgp/stream-armor.cpp index 6750206ba7..94b89369be 100644 --- a/src/librepgp/stream-armor.cpp +++ b/src/librepgp/stream-armor.cpp @@ -937,11 +937,6 @@ init_armored_dst(pgp_dest_t *dst, pgp_dest_t *writedst, pgp_armored_msg_t msgtyp /* armor header */ dst_write(writedst, hdr, strlen(hdr)); armor_write_eol(param); - /* version string */ - strncpy(hdr, "Version: " PACKAGE_STRING, sizeof(hdr)); - hdr[sizeof(hdr) - 1] = '\0'; - dst_write(writedst, hdr, strlen(hdr)); - armor_write_eol(param); /* empty line */ armor_write_eol(param); From 74f9c74184b3665e267ff43be4b82168e175e640 Mon Sep 17 00:00:00 2001 From: Daniel Wyatt Date: Tue, 5 May 2020 13:56:56 -0400 Subject: [PATCH 2/2] ci: Use actions/checkout@v2. There's a race condition with v1 that we seem to be encountering. --- .github/workflows/centos7.yml | 7 ++++++- .github/workflows/coverity.yml | 4 +++- .github/workflows/lint.yml | 2 +- .github/workflows/macos.yml | 4 +++- .github/workflows/ubuntu.yml | 4 +++- .github/workflows/windows.yml | 4 +++- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index b8640f40f1..0f79101d15 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -37,7 +37,12 @@ jobs: RNP_TESTS: rnp_tests env: ${{ matrix.env }} steps: - - uses: actions/checkout@v1 + - run: | + yum -y install http://opensource.wandisco.com/centos/7/git/x86_64/wandisco-git-release-7-2.noarch.rpm + yum -y install git + - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Add rnpuser run: | useradd rnpuser diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 11469b439a..b51ac55491 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -16,7 +16,9 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 20 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Setup environment run: | . ci/gha/setup-env.inc.sh diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 97dc4aa84c..44efd531b5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, 'skip ci')" steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: DoozyX/clang-format-lint-action@v0.5 with: clangFormatVersion: 9 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9621b1c4e9..b3814a92da 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,7 +18,9 @@ jobs: if: "!contains(github.event.head_commit.message, 'skip ci')" timeout-minutes: 50 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Setup environment run: | . ci/gha/setup-env.inc.sh diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 1b47347068..fbc6cc3bf0 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -18,7 +18,9 @@ jobs: if: "!contains(github.event.head_commit.message, 'skip ci')" timeout-minutes: 50 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Setup environment run: | . ci/gha/setup-env.inc.sh diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 254418c4f4..40676bfd25 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,7 +20,9 @@ jobs: steps: - name: Disable git eol translation run: git config --global core.autocrlf false - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 + with: + fetch-depth: 0 - name: Add MSYS2 path uses: MSP-Greg/msys2-action/add_paths@master - name: Update MSYS2