From 3a91ad6eb37996230fcbdca3d1e3b06c399b70f6 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Fri, 28 Jun 2024 15:16:03 -0700 Subject: [PATCH 1/2] Include generation of plain text version --- .ci/generate-licenses | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.ci/generate-licenses b/.ci/generate-licenses index 63a6bb0409b..b644f1c77db 100755 --- a/.ci/generate-licenses +++ b/.ci/generate-licenses @@ -59,3 +59,18 @@ sed "s/%VERSION%/${version}/" "${license_template}" > "${license_destination}" | failure "Unable to update version in ${license_destination}" sed -i "s/%YEAR%/${license_date}/" "${license_destination}" || failure "Unable to update year in ${license_destination}" + + +license_template="./templates/license/license.tmpl" +license_destination="${license_dir}/LICENSE.txt" + +debug "Updating license file: ${license_destination}" + +if [ ! -f "${license_template}" ]; then + failure "Unable to locate license template (${license_template})" +fi + +sed "s/%VERSION%/${version}/" "${license_template}" > "${license_destination}" || + failure "Unable to update version in ${license_destination}" +sed -i "s/%YEAR%/${license_date}/" "${license_destination}" || + failure "Unable to update year in ${license_destination}" From f0c4616c2849834ff49cb9acb8659cfd0a6280e9 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Fri, 28 Jun 2024 15:16:17 -0700 Subject: [PATCH 2/2] Update pinned action versions --- .github/workflows/code.yml | 2 +- .github/workflows/dev-appimage-build.yml | 2 +- .github/workflows/dev-arch-build.yml | 2 +- .github/workflows/dev-build.yml | 2 +- .github/workflows/dev-debs-build.yml | 2 +- .github/workflows/dev-macos-build.yml | 2 +- .github/workflows/dev-rpms-build.yml | 2 +- .github/workflows/dev-windows-build.yml | 2 +- .github/workflows/go-spectest.yml | 6 +++--- .github/workflows/go-testing.yml | 6 +++--- .github/workflows/initiate-release.yml | 2 +- .github/workflows/lock.yml | 2 +- .github/workflows/nightlies.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/testing.yml | 4 ++-- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 51539e67b67..393610fa36e 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false fetch-depth: 0 diff --git a/.github/workflows/dev-appimage-build.yml b/.github/workflows/dev-appimage-build.yml index a3fdf5ee5e1..70b2268a7cb 100644 --- a/.github/workflows/dev-appimage-build.yml +++ b/.github/workflows/dev-appimage-build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Trigger Development Build run: ./.ci/dev-build "${BRANCH}" "${COMMIT_ID}" build-appimage env: diff --git a/.github/workflows/dev-arch-build.yml b/.github/workflows/dev-arch-build.yml index 36918ebfc6f..51de6a7a5a6 100644 --- a/.github/workflows/dev-arch-build.yml +++ b/.github/workflows/dev-arch-build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Trigger Development Build run: ./.ci/dev-build "${BRANCH}" "${COMMIT_ID}" build-arch env: diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 72295048f22..e2a835014a6 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Trigger Development Build run: ./.ci/dev-build "${BRANCH}" "${COMMIT_ID}" build env: diff --git a/.github/workflows/dev-debs-build.yml b/.github/workflows/dev-debs-build.yml index 21384e513b9..d565761d3d6 100644 --- a/.github/workflows/dev-debs-build.yml +++ b/.github/workflows/dev-debs-build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Trigger Development Build run: ./.ci/dev-build "${BRANCH}" "${COMMIT_ID}" build-debs env: diff --git a/.github/workflows/dev-macos-build.yml b/.github/workflows/dev-macos-build.yml index fbea1e91650..9632c841a1f 100644 --- a/.github/workflows/dev-macos-build.yml +++ b/.github/workflows/dev-macos-build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Trigger Development Build run: ./.ci/dev-build "${BRANCH}" "${COMMIT_ID}" build-macos env: diff --git a/.github/workflows/dev-rpms-build.yml b/.github/workflows/dev-rpms-build.yml index 10002acbc75..177b50b66de 100644 --- a/.github/workflows/dev-rpms-build.yml +++ b/.github/workflows/dev-rpms-build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Trigger Development Build run: ./.ci/dev-build "${BRANCH}" "${COMMIT_ID}" build-rpms env: diff --git a/.github/workflows/dev-windows-build.yml b/.github/workflows/dev-windows-build.yml index 593a8ead46a..d6755ef5fc8 100644 --- a/.github/workflows/dev-windows-build.yml +++ b/.github/workflows/dev-windows-build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Trigger Development Build run: ./.ci/dev-build "${BRANCH}" "${COMMIT_ID}" build-windows env: diff --git a/.github/workflows/go-spectest.yml b/.github/workflows/go-spectest.yml index 07cce4efe5c..178325e0a0d 100644 --- a/.github/workflows/go-spectest.yml +++ b/.github/workflows/go-spectest.yml @@ -23,18 +23,18 @@ jobs: name: Vagrant acceptance tests (Ruby ${{ matrix.ruby }}) steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: submodules: 'recursive' # Also fetch all tags, since we need our version number in the build # to be based off a tag fetch-depth: 0 - name: Setup Go - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1 + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: go-version-file: go.mod - name: Setup Ruby - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0 + uses: ruby/setup-ruby@3783f195e29b74ae398d7caca108814bbafde90e # v1.180.1 with: ruby-version: ${{matrix.ruby}} bundler-cache: true diff --git a/.github/workflows/go-testing.yml b/.github/workflows/go-testing.yml index e0402072658..fb7d9c32def 100644 --- a/.github/workflows/go-testing.yml +++ b/.github/workflows/go-testing.yml @@ -30,13 +30,13 @@ jobs: name: Vagrant unit tests on Go (Ruby ${{ matrix.ruby }}) steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Go - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1 + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: go-version-file: go.mod - name: Setup Ruby - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0 + uses: ruby/setup-ruby@3783f195e29b74ae398d7caca108814bbafde90e # v1.180.1 with: ruby-version: ${{matrix.ruby}} bundler-cache: true diff --git a/.github/workflows/initiate-release.yml b/.github/workflows/initiate-release.yml index 53d9db459e4..ff2d0cac947 100644 --- a/.github/workflows/initiate-release.yml +++ b/.github/workflows/initiate-release.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: # NOTE: custom token is used so pushed tag will trigger release workflow token: ${{ secrets.HASHIBOT_TOKEN }} diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index 4df3b4802b3..a3481018dee 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -11,7 +11,7 @@ jobs: issues: write pull-requests: write steps: - - uses: dessant/lock-threads@be8aa5be94131386884a6da4189effda9b14aa21 # v4.0.1 + - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1 with: github-token: ${{ github.token }} issue-inactive-days: '30' diff --git a/.github/workflows/nightlies.yml b/.github/workflows/nightlies.yml index 6c12c0fbfac..17d5d31be60 100644 --- a/.github/workflows/nightlies.yml +++ b/.github/workflows/nightlies.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Trigger Nightly Build run: ./.ci/nightly-build "${COMMIT_ID}" env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5cb1ef1d9f9..8796e0d99f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Trigger Build run: ./.ci/release "${TAG}" "${COMMIT_ID}" env: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index a9e66984bba..ab09c7215e2 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -36,9 +36,9 @@ jobs: name: Vagrant unit tests on Ruby ${{ matrix.ruby }} steps: - name: Code Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Setup Ruby - uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0 + uses: ruby/setup-ruby@3783f195e29b74ae398d7caca108814bbafde90e # v1.180.1 with: ruby-version: ${{matrix.ruby}} bundler-cache: true