Skip to content

Commit 27a7c30

Browse files
Merge branch 'main' into feature/AST-112336
2 parents e15e699 + 71f2784 commit 27a7c30

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,14 @@ jobs:
6262
git checkout 4.4.15
6363
export HOMEBREW_NO_AUTO_UPDATE=1
6464
brew --version
65-
6665
- name: Install gon
6766
run: |
6867
brew install Bearer/tap/gon
68+
# New: detect architecture and expose as step output
69+
- name: Detect runner architecture
70+
id: arch
71+
run: |
72+
echo "arch=$(uname -m)" >> $GITHUB_OUTPUT
6973
- name: Setup Docker on macOS
7074
if: inputs.dev == false
7175
uses: douglascamata/setup-docker-macos-action@v1.0.1
@@ -83,8 +87,7 @@ jobs:
8387

8488
- name: Install Cosign
8589
if: inputs.dev == false
86-
run: |
87-
brew install sigstore/tap/cosign
90+
uses: sigstore/cosign-installer@v3.2.0
8891

8992
- name: Configure AWS Credentials
9093
uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 #v2

internal/services/osinstaller/os-installer-structs.go

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,28 @@ type InstallationConfiguration struct {
1515
}
1616

1717
func (i *InstallationConfiguration) ExecutableFilePath() string {
18-
return filepath.Join(os.TempDir(), i.WorkingDirName, i.ExecutableFile)
18+
basePath := os.TempDir()
19+
homeDir, err := os.UserHomeDir()
20+
if err == nil {
21+
basePath = homeDir + "/.checkmarx/"
22+
}
23+
return filepath.Join(basePath, i.WorkingDirName, i.ExecutableFile)
1924
}
2025

2126
func (i *InstallationConfiguration) HashFilePath() string {
22-
return filepath.Join(os.TempDir(), i.WorkingDirName, i.HashFileName)
27+
basePath := os.TempDir()
28+
homeDir, err := os.UserHomeDir()
29+
if err == nil {
30+
basePath = homeDir + "/.checkmarx/"
31+
}
32+
return filepath.Join(basePath, i.WorkingDirName, i.HashFileName)
2333
}
2434

2535
func (i *InstallationConfiguration) WorkingDir() string {
26-
return filepath.Join(os.TempDir(), i.WorkingDirName)
36+
basePath := os.TempDir()
37+
homeDir, err := os.UserHomeDir()
38+
if err == nil {
39+
basePath = homeDir + "/.checkmarx/"
40+
}
41+
return filepath.Join(basePath, i.WorkingDirName)
2742
}

0 commit comments

Comments
 (0)