Skip to content

Commit 0073553

Browse files
author
JFrog Pipelines Step
committed
Merge remote-tracking branch 'origin/dev'
2 parents 0db759f + 6fe2325 commit 0073553

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3178
-1918
lines changed

.github/workflows/analysis.yml

+14
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,17 @@ jobs:
5050
uses: securego/gosec@master
5151
with:
5252
args: -exclude=G204,G301,G302,G304,G306 -exclude-dir=\.*test\.* ./...
53+
54+
ShellCheck:
55+
name: Shellcheck
56+
runs-on: ubuntu-latest
57+
steps:
58+
- name: Checkout Source
59+
uses: actions/checkout@v4
60+
61+
- name: Run ShellCheck
62+
uses: ludeeus/action-shellcheck@master
63+
with:
64+
ignore_paths:
65+
.husky
66+
*test*

.github/workflows/test.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,16 @@ jobs:
120120
if: ${{ github.event_name != 'push' }}
121121
runs-on: ubuntu-latest
122122
steps:
123-
- name: Install Go
124-
uses: actions/setup-go@v3
125-
with:
126-
go-version: 1.20.x
127-
128123
- name: Checkout code
129124
uses: actions/checkout@v4
130125
with:
131126
ref: ${{ github.event.pull_request.head.sha }}
132127

128+
- name: Install Go
129+
uses: actions/setup-go@v3
130+
with:
131+
go-version: 1.20.x
132+
133133
- name: Build Frogbot
134134
run: buildscripts/build.sh
135135
- name: Scan
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Validate Pull Request Target Branch
2+
3+
on:
4+
pull_request_target:
5+
types:
6+
- opened
7+
- reopened
8+
- synchronize
9+
10+
jobs:
11+
validate-target-branch:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Check Target Branch
15+
run: |
16+
if [ "${{ github.base_ref }}" != "dev" ]; then
17+
echo "Pull requests must target the 'dev' branch."
18+
exit 1
19+
fi

action/.husky/pre-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
. "$(dirname "$0")/_/husky.sh"
33

44
if [ "$(git status action --porcelain=v1)" ]; then
5-
cd action
5+
cd action || exit
66
npm i
77
npm prune --production
88
git add node_modules lib

action/lib/utils.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ class Utils {
156156
return __awaiter(this, void 0, void 0, function* () {
157157
let cliDir = yield (0, tool_cache_1.cacheFile)(downloadDir, fileName, Utils.TOOL_NAME, version);
158158
if (!Utils.isWindows()) {
159-
(0, fs_1.chmodSync)((0, path_1.join)(cliDir, fileName), 0o555);
159+
let filePath = (0, path_1.normalize)((0, path_1.join)(cliDir, fileName));
160+
(0, fs_1.chmodSync)(filePath, 0o555);
160161
}
161162
core.addPath(cliDir);
162163
});

action/node_modules/.package-lock.json

+35-71
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)