Skip to content

Commit 1ba844f

Browse files
committed
Rename cnquery to mql
1 parent 93f9287 commit 1ba844f

5 files changed

Lines changed: 32 additions & 5 deletions

File tree

.github/workflows/goreleaser-edge.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ on:
55
branches:
66
- "main"
77
workflow_dispatch:
8+
inputs:
9+
upload-artifacts:
10+
description: "Upload artifacts to workflow"
11+
required: false
12+
default: false
13+
type: boolean
814

915
env:
1016
REGISTRY: docker.io
@@ -65,3 +71,11 @@ jobs:
6571
env:
6672
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6773
NFPM_DEFAULT_RPM_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
74+
75+
- name: Upload artifacts
76+
if: ${{ inputs.upload-artifacts == true }}
77+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
78+
with:
79+
name: mql-edge-linux
80+
path: dist/mql*
81+
retention-days: 7

.github/workflows/goreleaser.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ on:
2626
required: false
2727
default: false
2828
type: boolean
29+
skip-cnspec-bump:
30+
description: "Skip triggering cnquery version bump in cnspec"
31+
required: false
32+
default: false
33+
type: boolean
34+
make-latest:
35+
description: "Mark GitHub release as 'latest'"
36+
required: false
37+
default: true
38+
type: boolean
2939

3040
env:
3141
REGISTRY: docker.io
@@ -160,6 +170,7 @@ jobs:
160170
TSIGN_ACCOUNT_NAME: ${{ vars.TSIGN_ACCOUNT_NAME }}
161171
TSIGN_CERT_PROFILE_NAME: ${{ github.event.inputs.use-test-cert == 'true' && vars.TSIGN_TEST_CERT_PROFILE_NAME || vars.TSIGN_CERT_PROFILE_NAME }}
162172
TSIGN_ACCESS_TOKEN: ${{ steps.get_token.outputs.TSIGN_ACCESS_TOKEN }}
173+
MAKE_LATEST: ${{ inputs.make-latest == false && 'false' || 'true' }}
163174

164175
- name: Run GoReleaser (w/o Docker Release)
165176
if: ${{ inputs.skip-publish == true }}
@@ -186,6 +197,7 @@ jobs:
186197
TSIGN_ACCOUNT_NAME: ${{ vars.TSIGN_ACCOUNT_NAME }}
187198
TSIGN_CERT_PROFILE_NAME: ${{ github.event.inputs.use-test-cert == 'true' && vars.TSIGN_TEST_CERT_PROFILE_NAME || vars.TSIGN_CERT_PROFILE_NAME }}
188199
TSIGN_ACCESS_TOKEN: ${{ steps.get_token.outputs.TSIGN_ACCESS_TOKEN }}
200+
MAKE_LATEST: ${{ inputs.make-latest == false && 'false' || 'true' }}
189201

190202
- name: Check RPMs
191203
run: |
@@ -212,7 +224,7 @@ jobs:
212224
# We can now trigger the mql bump in cnspec, which will also trigger the release of cnspec.
213225
# The docker container is a pre-requisite for cnspec release.
214226
- name: Trigger mql bump in cnspec
215-
if: ${{ inputs.skip-publish != true }}
227+
if: ${{ inputs.skip-publish != true && inputs.skip-cnspec-bump != true && inputs.make-latest != false }}
216228
uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697 # v4.0.1
217229
with:
218230
token: ${{ secrets.RELEASR_ACTION_TOKEN }}

.goreleaser.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,3 +344,4 @@ docker_manifests: # https://goreleaser.com/customization/docker_manifest/
344344
- mondoo/{{ .ProjectName }}:latest-armv7-rootless
345345
release:
346346
replace_existing_artifacts: true
347+
make_latest: "{{ if index .Env \"MAKE_LATEST\" }}{{ .Env.MAKE_LATEST }}{{ else }}true{{ end }}"

test/commands/cli_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func setup() {
2525
cmd.Stderr = os.Stderr
2626
cmd.Stdout = os.Stdout
2727
if err := cmd.Run(); err != nil {
28-
log.Fatalf("building cnquery: %v", err)
28+
log.Fatalf("building mql: %v", err)
2929
}
3030

3131
// install local provider

test/sbom/sbom_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222

2323
var once sync.Once
2424

25-
// setup builds cnquery locally
25+
// setup builds mql locally
2626
func setup() {
2727
if err := exec.Command("go", "build", "../../apps/mql/mql.go").Run(); err != nil {
28-
log.Fatalf("building cnquery: %v", err)
28+
log.Fatalf("building mql: %v", err)
2929
}
3030
}
3131

@@ -98,7 +98,7 @@ func testSbomExport(t *testing.T, img string, update bool, useRecording bool) {
9898
args = append(args, "--use-recording", "testdata/"+fileImgName+"-recording.json")
9999
}
100100

101-
r := test.NewCliTestRunner("./cnquery", args...)
101+
r := test.NewCliTestRunner("./mql", args...)
102102
err := r.Run()
103103
require.NoError(t, err)
104104
assert.Equal(t, 0, r.ExitCode())

0 commit comments

Comments
 (0)