From b0e0c9465dedeb510412a4b938458b1f23c42e92 Mon Sep 17 00:00:00 2001 From: Catarina Paralta <46568597+paralta@users.noreply.github.com> Date: Thu, 8 Feb 2024 17:35:04 +0000 Subject: [PATCH 01/10] feat: create module set for release with all modules --- versions.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 versions.yaml diff --git a/versions.yaml b/versions.yaml new file mode 100644 index 000000000..820b3bf00 --- /dev/null +++ b/versions.yaml @@ -0,0 +1,21 @@ +module-sets: + vmclarity: + version: v0.6.0 + modules: + - github.com/openclarity/vmclarity/uibackend/types + - github.com/openclarity/vmclarity/uibackend/server + - github.com/openclarity/vmclarity/uibackend/client + - github.com/openclarity/vmclarity/core + - github.com/openclarity/vmclarity/provider + - github.com/openclarity/vmclarity/utils + - github.com/openclarity/vmclarity/installation + - github.com/openclarity/vmclarity/cli + - github.com/openclarity/vmclarity/testenv + - github.com/openclarity/vmclarity/api/types + - github.com/openclarity/vmclarity/api/server + - github.com/openclarity/vmclarity/api/client + - github.com/openclarity/vmclarity/e2e + - github.com/openclarity/vmclarity/containerruntimediscovery/types + - github.com/openclarity/vmclarity/containerruntimediscovery/server + - github.com/openclarity/vmclarity/containerruntimediscovery/client + - github.com/openclarity/vmclarity/orchestrator \ No newline at end of file From bec7d052713aef188e38d3b813fc1d117958411d Mon Sep 17 00:00:00 2001 From: Catarina Paralta <46568597+paralta@users.noreply.github.com> Date: Fri, 9 Feb 2024 10:53:50 +0000 Subject: [PATCH 02/10] feat: build multimod --- makefile.d/20-tools.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/makefile.d/20-tools.mk b/makefile.d/20-tools.mk index 9b433516a..3248b0d52 100644 --- a/makefile.d/20-tools.mk +++ b/makefile.d/20-tools.mk @@ -231,3 +231,16 @@ bin/typos-$(TYPOS_VERSION): | $(BIN_DIR) @curl -sSfL 'https://github.com/crate-ci/typos/releases/download/v$(TYPOS_VERSION)/typos-v$(TYPOS_VERSION)-$(TYPOS_ARCH)-$(TYPOS_OSTYPE).tar.gz' --output - \ | tar xzvOf - './typos' > $@ @chmod +x $@ + +#### +## Go MultiMod Releaser +#### + +MULTIMOD_BIN := $(BIN_DIR)/multimod +MULTIMOD_REPO_DIR := $(BIN_DIR)/opentelemetry-go-build-tools +MULTIMOD := $(BIN_DIR)/multimod + +bin/multimod: + @if [ ! -d $(MULTIMOD_REPO_DIR) ]; then git clone git@github.com:open-telemetry/opentelemetry-go-build-tools.git $(MULTIMOD_REPO_DIR); fi + @cd $(MULTIMOD_REPO_DIR)/multimod && go build -o $(MULTIMOD_BIN) main.go + @rm -rf $(MULTIMOD_REPO_DIR) From 37aa48b0ca4c3918c8b871d6ecc9d8e0243766fd Mon Sep 17 00:00:00 2001 From: Catarina Paralta <46568597+paralta@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:15:45 +0000 Subject: [PATCH 03/10] feat: add multimod verify and prerelease --- Makefile | 9 +++++++++ RELEASE.md | 26 ++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 RELEASE.md diff --git a/Makefile b/Makefile index 9f19c6859..022d31fce 100644 --- a/Makefile +++ b/Makefile @@ -491,3 +491,12 @@ endif $(DIST_DIR)/CHANGELOG.md: $(ROOT_DIR)/cliff.toml bin/git-cliff | $(DIST_DIR) $(GITCLIFF_BIN) --config $(ROOT_DIR)/cliff.toml --output $@ $(GITCLIFF_OPTS) + +.PHONY: multimod-verify +multimod-verify: bin/multimod + @echo "Validating versions.yaml file" + $(MULTIMOD) verify + +.PHONY: multimod-prerelease +multimod-prerelease: bin/multimod + $(MULTIMOD) prerelease --all-module-sets --skip-go-mod-tidy=true --commit-to-different-branch=false diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 000000000..dc73ab820 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,26 @@ +# Release + +VMClarity adopted the [Go MultiMod Releaser](https://github.com/open-telemetry/opentelemetry-go-build-tools/tree/main/multimod) to create a new release for each module. + +Find below the steps to create a release. + +## 1. Update the new release version + +Checkout to a new branch and update the version defined for VMClarity's module-set in `versions.yaml`. Please note that currently the same version is used for all methods. E.g. + +``` + vmclarity: +- version: v0.6.0 ++ version: v0.7.0 +``` + +Commit this change and verify the versioning with `make multimod-verify`. + +## 2. Bump all dependencies to new release version + +To update all `go.mod` files with the new release version, run `make multimod-prerelease` and review the changes in the last commit. + +## 3. Tag the new release commit + +## 4. Release + From 5f522da2ed95a803250e3f3c0bdad2c1d7daa415 Mon Sep 17 00:00:00 2001 From: Catarina Paralta <46568597+paralta@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:04:52 +0000 Subject: [PATCH 04/10] feat: add create and push tags --- Makefile | 7 +++++++ RELEASE.md | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 022d31fce..deb61d7d6 100644 --- a/Makefile +++ b/Makefile @@ -500,3 +500,10 @@ multimod-verify: bin/multimod .PHONY: multimod-prerelease multimod-prerelease: bin/multimod $(MULTIMOD) prerelease --all-module-sets --skip-go-mod-tidy=true --commit-to-different-branch=false + +.PHONY: multimod-push-tags +multimod-push-tags: bin/multimod + set -e; for tag in `$(MULTIMOD) tag --module-set-name vmclarity --commit-hash HEAD --print-tags | grep -v "Using" `; do \ + echo "pushing tag $${tag}"; \ + git push origin $${tag}; \ + done; diff --git a/RELEASE.md b/RELEASE.md index dc73ab820..84774f3f5 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -18,9 +18,12 @@ Commit this change and verify the versioning with `make multimod-verify`. ## 2. Bump all dependencies to new release version -To update all `go.mod` files with the new release version, run `make multimod-prerelease` and review the changes in the last commit. +To update all `go.mod` files with the new release version, run `make multimod-prerelease` and review the changes in the last commit. Then, create a pull request. -## 3. Tag the new release commit +## 3. Create and push tags + +Once the previous changes have been approved and merged, pull the latest changes in the `main` branch. Then, create the tags for the last commit and push them with `make multimod-push-tags`. ## 4. Release +Finally, create a Release on GitHub. From a139f28f5684bc5a5b7ddc5b47652c954bff7a4a Mon Sep 17 00:00:00 2001 From: Catarina Paralta <46568597+paralta@users.noreply.github.com> Date: Mon, 12 Feb 2024 18:12:05 +0000 Subject: [PATCH 05/10] docs: improve release instructions --- .github/workflows/semantic-pr.yml | 1 + RELEASE.md | 56 ++++++++++++++++++++++++------- versions.yaml | 2 +- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/.github/workflows/semantic-pr.yml b/.github/workflows/semantic-pr.yml index 040787fea..0636f7402 100644 --- a/.github/workflows/semantic-pr.yml +++ b/.github/workflows/semantic-pr.yml @@ -34,6 +34,7 @@ jobs: revert style test + release scopes: | api diff --git a/RELEASE.md b/RELEASE.md index 84774f3f5..8e73fe53d 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,29 +1,61 @@ # Release -VMClarity adopted the [Go MultiMod Releaser](https://github.com/open-telemetry/opentelemetry-go-build-tools/tree/main/multimod) to create a new release for each module. +This document outlines the process for creating a new release for VMClarity using the [Go MultiMod Releaser](https://github.com/open-telemetry/opentelemetry-go-build-tools/tree/main/multimod). All code block examples provided below correspond to an update to version `v0.7.0`, please update accordingly. -Find below the steps to create a release. +## 1. Update the New Release Version -## 1. Update the new release version - -Checkout to a new branch and update the version defined for VMClarity's module-set in `versions.yaml`. Please note that currently the same version is used for all methods. E.g. +* Create a new branch for the release version update. +```sh +git checkout -b release/v0.7.0 +``` +* Modify the `versions.yaml` file to update the version for VMClarity's module-set. Keep in mind that the same version is applied to all modules. ``` vmclarity: - version: v0.6.0 + version: v0.7.0 ``` -Commit this change and verify the versioning with `make multimod-verify`. +* Commit the changes with a suitable message. +```sh +git add versions.yaml +git commit -m "release: update module set to version v0.7.0" +``` + +* Run the version verification command to check for any issues. +```sh +make multimod-verify +``` + +## 2. Bump All Dependencies to the New Release Version -## 2. Bump all dependencies to new release version +* Run the following command to update all `go.mod` files to the new release version. +```sh +make multimod-prerelease +``` + +* Review the changes made in the last commit to ensure correctness. + +* Push the branch to the GitHub repository. +```sh +git push origin release/v0.7.0 +``` -To update all `go.mod` files with the new release version, run `make multimod-prerelease` and review the changes in the last commit. Then, create a pull request. +* Create a pull request with the changes. -## 3. Create and push tags +## 3. Create and Push Tags -Once the previous changes have been approved and merged, pull the latest changes in the `main` branch. Then, create the tags for the last commit and push them with `make multimod-push-tags`. +* After the pull request is approved and merged, update your local main branch. +```sh +git checkout main +git pull origin main +``` -## 4. Release +* Create and push the tags for the last commit to the repository. +```sh +make multimod-push-tags +``` -Finally, create a Release on GitHub. +## Post-release Checks +Verify that the `Release` workflow was completed successfully in the GitHub Actions section. +Ensure that the release is visible in the GitHub releases page. Additionally, check that the release description is correct and all assets are listed. diff --git a/versions.yaml b/versions.yaml index 820b3bf00..ce40adcd3 100644 --- a/versions.yaml +++ b/versions.yaml @@ -18,4 +18,4 @@ module-sets: - github.com/openclarity/vmclarity/containerruntimediscovery/types - github.com/openclarity/vmclarity/containerruntimediscovery/server - github.com/openclarity/vmclarity/containerruntimediscovery/client - - github.com/openclarity/vmclarity/orchestrator \ No newline at end of file + - github.com/openclarity/vmclarity/orchestrator From f37c46a3163290c53767e3589c3487ff34a3910c Mon Sep 17 00:00:00 2001 From: Catarina Paralta <46568597+paralta@users.noreply.github.com> Date: Thu, 15 Feb 2024 13:00:10 +0000 Subject: [PATCH 06/10] refactor: code review --- Makefile | 6 +++--- RELEASE.md | 2 +- makefile.d/20-tools.mk | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index deb61d7d6..9f11e5326 100644 --- a/Makefile +++ b/Makefile @@ -495,15 +495,15 @@ $(DIST_DIR)/CHANGELOG.md: $(ROOT_DIR)/cliff.toml bin/git-cliff | $(DIST_DIR) .PHONY: multimod-verify multimod-verify: bin/multimod @echo "Validating versions.yaml file" - $(MULTIMOD) verify + $(MULTIMOD_BIN) verify .PHONY: multimod-prerelease multimod-prerelease: bin/multimod - $(MULTIMOD) prerelease --all-module-sets --skip-go-mod-tidy=true --commit-to-different-branch=false + $(MULTIMOD_BIN) prerelease --all-module-sets --skip-go-mod-tidy=true --commit-to-different-branch=false .PHONY: multimod-push-tags multimod-push-tags: bin/multimod - set -e; for tag in `$(MULTIMOD) tag --module-set-name vmclarity --commit-hash HEAD --print-tags | grep -v "Using" `; do \ + set -e; for tag in `$(MULTIMOD_BIN) tag --module-set-name vmclarity --commit-hash HEAD --print-tags | grep -v "Using" `; do \ echo "pushing tag $${tag}"; \ git push origin $${tag}; \ done; diff --git a/RELEASE.md b/RELEASE.md index 8e73fe53d..48fa8e00c 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -10,7 +10,7 @@ git checkout -b release/v0.7.0 ``` * Modify the `versions.yaml` file to update the version for VMClarity's module-set. Keep in mind that the same version is applied to all modules. -``` +```diff vmclarity: - version: v0.6.0 + version: v0.7.0 diff --git a/makefile.d/20-tools.mk b/makefile.d/20-tools.mk index 3248b0d52..bb193b321 100644 --- a/makefile.d/20-tools.mk +++ b/makefile.d/20-tools.mk @@ -238,7 +238,6 @@ bin/typos-$(TYPOS_VERSION): | $(BIN_DIR) MULTIMOD_BIN := $(BIN_DIR)/multimod MULTIMOD_REPO_DIR := $(BIN_DIR)/opentelemetry-go-build-tools -MULTIMOD := $(BIN_DIR)/multimod bin/multimod: @if [ ! -d $(MULTIMOD_REPO_DIR) ]; then git clone git@github.com:open-telemetry/opentelemetry-go-build-tools.git $(MULTIMOD_REPO_DIR); fi From db9816318bba8bf1d6326f0875860895b13bd4a6 Mon Sep 17 00:00:00 2001 From: Catarina Paralta <46568597+paralta@users.noreply.github.com> Date: Fri, 23 Feb 2024 11:31:22 +0000 Subject: [PATCH 07/10] feat: move module tags creation to pipeline --- .github/workflows/release.yaml | 56 +++++++++++++++++----------------- RELEASE.md | 7 +++-- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index b97757366..0ef510176 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -116,7 +116,7 @@ jobs: if-no-files-found: error compression-level: 0 - main_release: + prerelease: needs: - verification - build_and_push @@ -125,10 +125,17 @@ jobs: name: Release runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - with: - fetch-depth: 0 + - name: Delete tag + # env: + # VERSION: ${{ github.ref_name }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: git push origin :${{ github.ref_name }} + + - name: Create and push module tags + # env: + # VERSION: ${{ github.ref_name }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: make multimod-push-tags - name: Download artifacts uses: actions/download-artifact@eaceaf801fd36c7dee90939fad912460b18a1ffe # v4.1.2 @@ -142,6 +149,20 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: make generate-release-notes + main_release: + needs: + - prerelease + name: Release + runs-on: ubuntu-latest + strategy: + matrix: + tags: ["uibackend/types", "uibackend/server", "uibackend/client", "core", "provider", "utils", "installation", "cli", "testenv", "api/types", "api/server", "api/client", "e2e", "containerruntimediscovery/types", "containerruntimediscovery/server", "containerruntimediscovery/client", "orchestrator"] + steps: + - name: Checkout + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + fetch-depth: 0 + - uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # v1.14.0 with: allowUpdates: true @@ -149,27 +170,6 @@ jobs: artifacts: "dist/*.tar.gz,dist/*.sha256sum,dist/bicep/vmclarity.json,dist/bicep/vmclarity-UI.json" bodyFile: "dist/CHANGELOG.md" draft: true - name: "Release ${{ github.ref_name }}" + name: "Release ${{ matrix.tags }}" updateOnlyUnreleased: true - - # TODO(sambetts) We need to publish a tag in the format "api/" tag - # so that go mod is able to import the api module without overriding. We need - # to work out how to do this cleanly from github actions on release so that - # we don't need to manage it manually. We could do something this which will - # create another release: - # - # api_release: - # needs: release - # name: Release API Module - # runs-on: ubuntu-latest - # steps: - # - name: Checkout - # uses: actions/checkout@v4 - # with: - # fetch-depth: 0 - # - name: Release API - # uses: softprops/action-gh-release@v1 - # with: - # name: VMClarity {{ github.ref }} API - # body: See main {{ github.ref }} release for release notes. - # tag_name: api/{{ github.ref }} + tag: ${{ matrix.tags }}/${{ github.ref_name }} diff --git a/RELEASE.md b/RELEASE.md index 48fa8e00c..b9c34465e 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -43,7 +43,7 @@ git push origin release/v0.7.0 * Create a pull request with the changes. -## 3. Create and Push Tags +## 3. Create and Push Tag * After the pull request is approved and merged, update your local main branch. ```sh @@ -51,9 +51,10 @@ git checkout main git pull origin main ``` -* Create and push the tags for the last commit to the repository. +* Create and push a new tag in order to trigger the `Release` workflow. ```sh -make multimod-push-tags +git tag -a v0.7.0 +git push origin v0.7.0 ``` ## Post-release Checks From 2a6cf13fa2a235abbd4ca310f3fbbcf48d1d1d6d Mon Sep 17 00:00:00 2001 From: paralta <46568597+paralta@users.noreply.github.com> Date: Mon, 26 Feb 2024 10:46:48 +0000 Subject: [PATCH 08/10] test: simplify release --- .github/workflows/release.yaml | 106 +----------------- .github/workflows/reusable-build-and-push.yml | 4 +- .../workflows/reusable-end-to-end-testing.yml | 4 +- .github/workflows/reusable-verification.yml | 5 - .github/workflows/semantic-pr.yml | 78 ------------- Makefile | 4 +- docker-bake.hcl | 9 +- 7 files changed, 12 insertions(+), 198 deletions(-) delete mode 100644 .github/workflows/semantic-pr.yml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0ef510176..a25c1abe3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,16 +10,7 @@ permissions: contents: write jobs: - verification: - name: Verification - uses: ./.github/workflows/reusable-verification.yml - secrets: inherit - build_and_push: - needs: - - verification - - artifacts - - publish_helm name: Build & Push uses: ./.github/workflows/reusable-build-and-push.yml with: @@ -27,101 +18,9 @@ jobs: push: true use_release_repository: true - publish_helm: - needs: verification - name: Publish Helm Chart - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - name: Create Helm Chart package - env: - VERSION: ${{ github.ref_name }} - run: make dist-helm-chart - - - name: Login to GitHub Container Registry - uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Package and Publish Helm Chart - env: - VERSION: ${{ github.ref_name }} - run: make publish-helm-chart - - artifacts: - name: Create artifacts - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - - name: Set up Go - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5 - with: - # NOTE(chrisgacsal): Use actions/cache for caching Go dependency and build caches - # as if provides better flexibility like setting the cache key which reduces cache misses significantly. - cache: false - go-version-file: '.go-version' - - - name: Setup Go caching - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4 - with: - path: | - ~/.cache/go-build - ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ github.ref_name }}-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go-${{ github.ref_name }}- - ${{ runner.os }}-go-${{ github.event.repository.default_branch }}- - - - name: Create vmclarity-cli manifest(s) - env: - VERSION: ${{ github.ref_name }} - run: make dist-vmclarity-cli - - - name: Create Cloudformation manifest(s) - env: - VERSION: ${{ github.ref_name }} - run: make dist-cloudformation - - - name: Create Azure Bicep manifest(s) - env: - VERSION: ${{ github.ref_name }} - run: make dist-bicep - - - name: Create Docker Compose manifest(s) - env: - VERSION: ${{ github.ref_name }} - run: make dist-docker-compose - - - name: Create Google Cloud Deployment manifest(s) - env: - VERSION: ${{ github.ref_name }} - run: make dist-gcp-deployment - - - name: Upload - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 - with: - name: artifacts - path: | - dist/*.tar.gz - dist/*.tgz - dist/*.sha256sum - dist/bicep/vmclarity.json - dist/bicep/vmclarity-UI.json - if-no-files-found: error - compression-level: 0 - prerelease: needs: - - verification - build_and_push - - publish_helm - - artifacts name: Release runs-on: ubuntu-latest steps: @@ -156,7 +55,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - tags: ["uibackend/types", "uibackend/server", "uibackend/client", "core", "provider", "utils", "installation", "cli", "testenv", "api/types", "api/server", "api/client", "e2e", "containerruntimediscovery/types", "containerruntimediscovery/server", "containerruntimediscovery/client", "orchestrator"] + tags: + - "containerruntimediscovery/types" + - "containerruntimediscovery/server" + - "containerruntimediscovery/client" steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 diff --git a/.github/workflows/reusable-build-and-push.yml b/.github/workflows/reusable-build-and-push.yml index 431df48af..979cd59cd 100644 --- a/.github/workflows/reusable-build-and-push.yml +++ b/.github/workflows/reusable-build-and-push.yml @@ -6,8 +6,8 @@ on: registry_name: required: false type: string - description: 'Registry name used for container image names. Default is `ghcr.io/openclarity`.' - default: ghcr.io/openclarity + description: 'Registry name used for container image names. Default is `ghcr.io/paralta`.' + default: ghcr.io/paralta image_tag: required: true type: string diff --git a/.github/workflows/reusable-end-to-end-testing.yml b/.github/workflows/reusable-end-to-end-testing.yml index 873a07bb7..1d71fd4f9 100644 --- a/.github/workflows/reusable-end-to-end-testing.yml +++ b/.github/workflows/reusable-end-to-end-testing.yml @@ -10,8 +10,8 @@ on: registry_name: required: false type: string - description: 'Registry name used for container image names. Default is `ghcr.io/openclarity`.' - default: ghcr.io/openclarity + description: 'Registry name used for container image names. Default is `ghcr.io/paralta`.' + default: ghcr.io/paralta use_release_repository: required: false type: boolean diff --git a/.github/workflows/reusable-verification.yml b/.github/workflows/reusable-verification.yml index ac43d7b6d..a2dce70a4 100644 --- a/.github/workflows/reusable-verification.yml +++ b/.github/workflows/reusable-verification.yml @@ -40,11 +40,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: make license-cache - - name: Check licenses - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: make license-check - distributions: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/semantic-pr.yml b/.github/workflows/semantic-pr.yml deleted file mode 100644 index 0636f7402..000000000 --- a/.github/workflows/semantic-pr.yml +++ /dev/null @@ -1,78 +0,0 @@ -name: "Lint PR title" - -on: - pull_request_target: - types: - - opened - - edited - - reopened - - synchronize - -permissions: - pull-requests: write - -jobs: - main: - name: Validate PR title - runs-on: ubuntu-latest - steps: - - uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f # v5.4.0 - id: lint_pr_title - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - types: | - BREAKING - build - chore - ci - docs - feat - fix - perf - refactor - revert - style - test - release - - scopes: | - api - cli - orchestrator - provider - ui - uibackend - - aws - azure - docker - gcp - helm - k8s - - deps - e2e - testenv - - # Leave a comment if linter reports an error - - uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2.9.0 - if: always() && (steps.lint_pr_title.outputs.error_message != null) - with: - header: pr-title-lint-error - message: | - Hey there and thank you for opening this pull request! 👋🏼 - - We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/) and it looks like your proposed title needs to be adjusted. - - Details: - - ``` - ${{ steps.lint_pr_title.outputs.error_message }} - ``` - # Hide error message if the PR title has been fixed - - if: ${{ steps.lint_pr_title.outputs.error_message == null }} - uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2.9.0 - with: - header: pr-title-lint-error - delete: true diff --git a/Makefile b/Makefile index 9f11e5326..916accb1d 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ SHELL = /usr/bin/env bash -o pipefail #### VERSION ?= $(shell git rev-parse --short HEAD) -DOCKER_REGISTRY ?= ghcr.io/openclarity +DOCKER_REGISTRY ?= ghcr.io/paralta DOCKER_PUSH ?= false DOCKER_TAG ?= $(VERSION) VMCLARITY_TOOLS_BASE ?= @@ -29,7 +29,7 @@ BUILD_TIMESTAMP := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") COMMIT_HASH := $(shell git rev-parse HEAD) INSTALLATION_DIR := $(ROOT_DIR)/installation HELM_CHART_DIR := $(INSTALLATION_DIR)/kubernetes/helm -HELM_OCI_REPOSITORY := ghcr.io/openclarity/charts +HELM_OCI_REPOSITORY := ghcr.io/paralta/charts DIST_DIR ?= $(ROOT_DIR)/dist #### diff --git a/docker-bake.hcl b/docker-bake.hcl index 141f3c29c..c879193e9 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,7 +1,7 @@ # Documentation available at: https://docs.docker.com/build/bake/ # Docker build args -variable "DOCKER_REGISTRY" {default = "ghcr.io/openclarity"} +variable "DOCKER_REGISTRY" {default = "ghcr.io/paralta"} variable "DOCKER_TAG" {default = "latest"} variable "SUFFIX" {default = ""} @@ -19,12 +19,7 @@ function "get_tag" { group "default" { targets = [ - "vmclarity-apiserver", - "vmclarity-cli", - "vmclarity-cr-discovery-server", - "vmclarity-orchestrator", - "vmclarity-ui", - "vmclarity-ui-backend" + "vmclarity-cr-discovery-server" ] } From a41580413620997c7a3f677cf5726264e973dacc Mon Sep 17 00:00:00 2001 From: paralta <46568597+paralta@users.noreply.github.com> Date: Mon, 26 Feb 2024 10:58:45 +0000 Subject: [PATCH 09/10] release: update module set to version v0.7.0 --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index ce40adcd3..277a79971 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,6 +1,6 @@ module-sets: vmclarity: - version: v0.6.0 + version: v0.7.0-rc0 modules: - github.com/openclarity/vmclarity/uibackend/types - github.com/openclarity/vmclarity/uibackend/server From 82f902eb52f95cbc3d65ea40b2a52c9fd534c5f6 Mon Sep 17 00:00:00 2001 From: paralta <46568597+paralta@users.noreply.github.com> Date: Mon, 26 Feb 2024 10:58:59 +0000 Subject: [PATCH 10/10] Prepare vmclarity for version v0.7.0-rc0 --- api/client/go.mod | 4 ++-- api/server/go.mod | 4 ++-- cli/go.mod | 8 ++++---- containerruntimediscovery/client/go.mod | 4 ++-- containerruntimediscovery/server/go.mod | 6 +++--- containerruntimediscovery/types/go.mod | 2 +- e2e/go.mod | 16 ++++++++-------- installation/go.mod | 2 +- orchestrator/go.mod | 14 +++++++------- provider/go.mod | 10 +++++----- testenv/go.mod | 6 +++--- uibackend/client/go.mod | 2 +- uibackend/server/go.mod | 10 +++++----- 13 files changed, 44 insertions(+), 44 deletions(-) diff --git a/api/client/go.mod b/api/client/go.mod index a03555fb4..3deb15379 100644 --- a/api/client/go.mod +++ b/api/client/go.mod @@ -5,8 +5,8 @@ go 1.21.4 require ( github.com/deepmap/oapi-codegen/v2 v2.1.0 github.com/oapi-codegen/runtime v1.1.1 - github.com/openclarity/vmclarity/api/types v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/core v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/api/types v0.7.0-rc0 + github.com/openclarity/vmclarity/core v0.7.0-rc0 ) require ( diff --git a/api/server/go.mod b/api/server/go.mod index 5e4a4051d..ce4b357b8 100644 --- a/api/server/go.mod +++ b/api/server/go.mod @@ -16,8 +16,8 @@ require ( github.com/oapi-codegen/echo-middleware v1.0.1 github.com/oapi-codegen/runtime v1.1.1 github.com/onsi/gomega v1.31.1 - github.com/openclarity/vmclarity/api/types v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/core v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/api/types v0.7.0-rc0 + github.com/openclarity/vmclarity/core v0.7.0-rc0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 diff --git a/cli/go.mod b/cli/go.mod index 3cf81b06c..a146de31b 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -22,10 +22,10 @@ require ( github.com/jinzhu/copier v0.4.0 github.com/onsi/gomega v1.31.1 github.com/openclarity/grype-server/api v0.0.0-20240201133700-ad5e6432b894 - github.com/openclarity/vmclarity/api/client v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/api/types v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/core v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/utils v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/api/client v0.7.0-rc0 + github.com/openclarity/vmclarity/api/types v0.7.0-rc0 + github.com/openclarity/vmclarity/core v0.7.0-rc0 + github.com/openclarity/vmclarity/utils v0.7.0-rc0 github.com/openclarity/yara-rule-server v0.3.0 github.com/package-url/packageurl-go v0.1.2 github.com/sirupsen/logrus v1.9.3 diff --git a/containerruntimediscovery/client/go.mod b/containerruntimediscovery/client/go.mod index 6ac48c28f..0c4eed0b6 100644 --- a/containerruntimediscovery/client/go.mod +++ b/containerruntimediscovery/client/go.mod @@ -3,8 +3,8 @@ module github.com/openclarity/vmclarity/containerruntimediscovery/client go 1.21.4 require ( - github.com/openclarity/vmclarity/api/types v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/containerruntimediscovery/types v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/api/types v0.7.0-rc0 + github.com/openclarity/vmclarity/containerruntimediscovery/types v0.7.0-rc0 ) require ( diff --git a/containerruntimediscovery/server/go.mod b/containerruntimediscovery/server/go.mod index 22a6c0479..448b2a283 100644 --- a/containerruntimediscovery/server/go.mod +++ b/containerruntimediscovery/server/go.mod @@ -3,8 +3,8 @@ module github.com/openclarity/vmclarity/containerruntimediscovery/server go 1.21.4 require ( - github.com/openclarity/vmclarity/api/types v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/containerruntimediscovery/types v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/api/types v0.7.0-rc0 + github.com/openclarity/vmclarity/containerruntimediscovery/types v0.7.0-rc0 ) require ( @@ -13,7 +13,7 @@ require ( github.com/containers/image/v5 v5.29.2 github.com/docker/docker v25.0.3+incompatible github.com/labstack/echo/v4 v4.11.4 - github.com/openclarity/vmclarity/core v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/core v0.7.0-rc0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 diff --git a/containerruntimediscovery/types/go.mod b/containerruntimediscovery/types/go.mod index f926072a1..9ce380fe8 100644 --- a/containerruntimediscovery/types/go.mod +++ b/containerruntimediscovery/types/go.mod @@ -2,7 +2,7 @@ module github.com/openclarity/vmclarity/containerruntimediscovery/types go 1.21.4 -require github.com/openclarity/vmclarity/api/types v0.0.0-00010101000000-000000000000 +require github.com/openclarity/vmclarity/api/types v0.7.0-rc0 require ( github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect diff --git a/e2e/go.mod b/e2e/go.mod index 05fae83a9..46cbb5c62 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -7,12 +7,12 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/onsi/ginkgo/v2 v2.15.0 github.com/onsi/gomega v1.31.1 - github.com/openclarity/vmclarity/api/client v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/api/types v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/core v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/testenv v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/uibackend/client v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/uibackend/types v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/api/client v0.7.0-rc0 + github.com/openclarity/vmclarity/api/types v0.7.0-rc0 + github.com/openclarity/vmclarity/core v0.7.0-rc0 + github.com/openclarity/vmclarity/testenv v0.7.0-rc0 + github.com/openclarity/vmclarity/uibackend/client v0.7.0-rc0 + github.com/openclarity/vmclarity/uibackend/types v0.7.0-rc0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/viper v1.18.2 ) @@ -161,8 +161,8 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/oapi-codegen/runtime v1.1.1 // indirect - github.com/openclarity/vmclarity/installation v0.0.0-00010101000000-000000000000 // indirect - github.com/openclarity/vmclarity/utils v0.0.0-20240202114539-0b2edd72c17d // indirect + github.com/openclarity/vmclarity/installation v0.7.0-rc0 // indirect + github.com/openclarity/vmclarity/utils v0.7.0-rc0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc6 // indirect github.com/pelletier/go-toml v1.9.5 // indirect diff --git a/installation/go.mod b/installation/go.mod index ab90bb995..9288c312d 100644 --- a/installation/go.mod +++ b/installation/go.mod @@ -2,6 +2,6 @@ module github.com/openclarity/vmclarity/installation go 1.21.4 -require github.com/openclarity/vmclarity/utils v0.0.0-20240202114539-0b2edd72c17d +require github.com/openclarity/vmclarity/utils v0.7.0-rc0 replace github.com/openclarity/vmclarity/utils => ../utils diff --git a/orchestrator/go.mod b/orchestrator/go.mod index 4af8d167c..f30eccffa 100644 --- a/orchestrator/go.mod +++ b/orchestrator/go.mod @@ -9,11 +9,11 @@ require ( github.com/google/go-cmp v0.6.0 github.com/mitchellh/mapstructure v1.5.0 github.com/onsi/gomega v1.31.1 - github.com/openclarity/vmclarity/api/client v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/api/types v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/cli v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/core v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/provider v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/api/client v0.7.0-rc0 + github.com/openclarity/vmclarity/api/types v0.7.0-rc0 + github.com/openclarity/vmclarity/cli v0.7.0-rc0 + github.com/openclarity/vmclarity/core v0.7.0-rc0 + github.com/openclarity/vmclarity/provider v0.7.0-rc0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 @@ -308,8 +308,8 @@ require ( github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/open-policy-agent/opa v0.61.0 // indirect github.com/openclarity/grype-server/api v0.0.0-20240201133700-ad5e6432b894 // indirect - github.com/openclarity/vmclarity/containerruntimediscovery/client v0.0.0-00010101000000-000000000000 // indirect - github.com/openclarity/vmclarity/containerruntimediscovery/types v0.0.0-00010101000000-000000000000 // indirect + github.com/openclarity/vmclarity/containerruntimediscovery/client v0.7.0-rc0 // indirect + github.com/openclarity/vmclarity/containerruntimediscovery/types v0.7.0-rc0 // indirect github.com/openclarity/yara-rule-server v0.3.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc6 // indirect diff --git a/provider/go.mod b/provider/go.mod index 9b2a02832..56ae49937 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -20,11 +20,11 @@ require ( github.com/google/go-cmp v0.6.0 github.com/mitchellh/mapstructure v1.5.0 github.com/onsi/gomega v1.31.1 - github.com/openclarity/vmclarity/api/types v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/cli v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/containerruntimediscovery/client v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/containerruntimediscovery/types v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/core v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/api/types v0.7.0-rc0 + github.com/openclarity/vmclarity/cli v0.7.0-rc0 + github.com/openclarity/vmclarity/containerruntimediscovery/client v0.7.0-rc0 + github.com/openclarity/vmclarity/containerruntimediscovery/types v0.7.0-rc0 + github.com/openclarity/vmclarity/core v0.7.0-rc0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/viper v1.18.2 golang.org/x/sync v0.6.0 diff --git a/testenv/go.mod b/testenv/go.mod index f60cf6d94..4966acf9a 100644 --- a/testenv/go.mod +++ b/testenv/go.mod @@ -11,8 +11,8 @@ require ( github.com/ghodss/yaml v1.0.0 github.com/mitchellh/mapstructure v1.5.0 github.com/onsi/gomega v1.31.1 - github.com/openclarity/vmclarity/core v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/installation v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/core v0.7.0-rc0 + github.com/openclarity/vmclarity/installation v0.7.0-rc0 github.com/opencontainers/go-digest v1.0.0 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.3 @@ -154,7 +154,7 @@ require ( github.com/morikuni/aec v1.0.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/openclarity/vmclarity/utils v0.0.0-20240202114539-0b2edd72c17d // indirect + github.com/openclarity/vmclarity/utils v0.7.0-rc0 // indirect github.com/opencontainers/image-spec v1.1.0-rc6 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect diff --git a/uibackend/client/go.mod b/uibackend/client/go.mod index b3f99599f..4615e7722 100644 --- a/uibackend/client/go.mod +++ b/uibackend/client/go.mod @@ -5,7 +5,7 @@ go 1.21.4 require ( github.com/deepmap/oapi-codegen/v2 v2.1.0 github.com/oapi-codegen/runtime v1.1.1 - github.com/openclarity/vmclarity/uibackend/types v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/uibackend/types v0.7.0-rc0 ) require ( diff --git a/uibackend/server/go.mod b/uibackend/server/go.mod index 46c0f6092..b46f77010 100644 --- a/uibackend/server/go.mod +++ b/uibackend/server/go.mod @@ -12,11 +12,11 @@ require ( github.com/oapi-codegen/echo-middleware v1.0.1 github.com/oapi-codegen/runtime v1.1.1 github.com/onsi/gomega v1.31.1 - github.com/openclarity/vmclarity/api/client v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/api/types v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/cli v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/core v0.0.0-00010101000000-000000000000 - github.com/openclarity/vmclarity/uibackend/types v0.0.0-00010101000000-000000000000 + github.com/openclarity/vmclarity/api/client v0.7.0-rc0 + github.com/openclarity/vmclarity/api/types v0.7.0-rc0 + github.com/openclarity/vmclarity/cli v0.7.0-rc0 + github.com/openclarity/vmclarity/core v0.7.0-rc0 + github.com/openclarity/vmclarity/uibackend/types v0.7.0-rc0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2