Skip to content

Commit 68ce060

Browse files
Fix git workflow
1 parent 317ed8e commit 68ce060

File tree

2 files changed

+29
-24
lines changed

2 files changed

+29
-24
lines changed

.github/workflows/main.yml

+26-23
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,39 @@ on:
55
push:
66
branches:
77
- main
8-
- fix/git-workflow
98
pull_request:
10-
branches:
11-
- main
129

1310
jobs:
1411
build:
15-
continue-on-error: False
12+
continue-on-error: True
1613
runs-on: ubuntu-latest
1714
steps:
18-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
- uses: actions/setup-node@v3
19+
with:
20+
node-version: 18
21+
cache: 'npm'
1922
- name: Install modules
2023
run: yarn
24+
- run: git branch --track main origin/main
2125
- name: Run ESLint
2226
run: yarn nx affected -t lint
23-
# - name: Run Test
24-
# run: yarn test
25-
# scan:
26-
# name: gitleaks
27-
# runs-on: ubuntu-latest
28-
# steps:
29-
# - uses: actions/checkout@v3
30-
# with:
31-
# fetch-depth: 0
32-
# - uses: actions/setup-go@v3
33-
# with:
34-
# go-version: "1.17.7"
35-
# - run: |
36-
# wget https://github.com/zricethezav/gitleaks/releases/download/v8.10.1/gitleaks_8.10.1_linux_x64.tar.gz && \
37-
# tar -xzf gitleaks_8.10.1_linux_x64.tar.gz && \
38-
# sudo install gitleaks /usr/bin && \
39-
# gitleaks detect --report-format json --report-path leak_report -v
40-
27+
- name: Run Test
28+
run: yarn nx affected -t test
29+
scan:
30+
name: gitleaks
31+
runs-on: ubuntu-latest
32+
steps:
33+
- uses: actions/checkout@v3
34+
with:
35+
fetch-depth: 0
36+
- uses: actions/setup-go@v3
37+
with:
38+
go-version: '1.17.7'
39+
- run: |
40+
wget https://github.com/zricethezav/gitleaks/releases/download/v8.10.1/gitleaks_8.10.1_linux_x64.tar.gz && \
41+
tar -xzf gitleaks_8.10.1_linux_x64.tar.gz && \
42+
sudo install gitleaks /usr/bin && \
43+
gitleaks detect --report-format json --report-path leak_report -v

nx.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@
6464
"!{projectRoot}/**/*.cy.[jt]s?(x)",
6565
"!{projectRoot}/cypress.config.[jt]s"
6666
],
67-
"sharedGlobals": []
67+
"sharedGlobals": [
68+
"{workspaceRoot}/.github/workflows/main.yml"
69+
]
6870
},
6971
"generators": {
7072
"@nx/react": {

0 commit comments

Comments
 (0)