Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
JFrog Pipelines Step committed Sep 20, 2023
2 parents 0db759f + 6fe2325 commit 0073553
Show file tree
Hide file tree
Showing 63 changed files with 3,178 additions and 1,918 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,17 @@ jobs:
uses: securego/gosec@master
with:
args: -exclude=G204,G301,G302,G304,G306 -exclude-dir=\.*test\.* ./...

ShellCheck:
name: Shellcheck
runs-on: ubuntu-latest
steps:
- name: Checkout Source
uses: actions/checkout@v4

- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
with:
ignore_paths:
.husky
*test*
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,16 @@ jobs:
if: ${{ github.event_name != 'push' }}
runs-on: ubuntu-latest
steps:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.20.x

- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.20.x

- name: Build Frogbot
run: buildscripts/build.sh
- name: Scan
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/validate-pr-target-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Validate Pull Request Target Branch

on:
pull_request_target:
types:
- opened
- reopened
- synchronize

jobs:
validate-target-branch:
runs-on: ubuntu-latest
steps:
- name: Check Target Branch
run: |
if [ "${{ github.base_ref }}" != "dev" ]; then
echo "Pull requests must target the 'dev' branch."
exit 1
fi
2 changes: 1 addition & 1 deletion action/.husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
. "$(dirname "$0")/_/husky.sh"

if [ "$(git status action --porcelain=v1)" ]; then
cd action
cd action || exit
npm i
npm prune --production
git add node_modules lib
Expand Down
3 changes: 2 additions & 1 deletion action/lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ class Utils {
return __awaiter(this, void 0, void 0, function* () {
let cliDir = yield (0, tool_cache_1.cacheFile)(downloadDir, fileName, Utils.TOOL_NAME, version);
if (!Utils.isWindows()) {
(0, fs_1.chmodSync)((0, path_1.join)(cliDir, fileName), 0o555);
let filePath = (0, path_1.normalize)((0, path_1.join)(cliDir, fileName));
(0, fs_1.chmodSync)(filePath, 0o555);
}
core.addPath(cliDir);
});
Expand Down
106 changes: 35 additions & 71 deletions action/node_modules/.package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0073553

Please sign in to comment.