Skip to content

Commit 1befd5d

Browse files
authored
Merge pull request #2590 from cuipinghuo/disable-duplicated-acceptance
refactor: remove acceptance job from checks workflow
2 parents e9225f9 + 87fadc0 commit 1befd5d

File tree

2 files changed

+5
-43
lines changed

2 files changed

+5
-43
lines changed
Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
with:
6060
go-version-file: go.mod
6161
cache: false
62-
62+
6363
- name: Check go versions
6464
uses: enterprise-contract/github-workflows/golang-version-check@main
6565

@@ -102,44 +102,6 @@ jobs:
102102
files: ./coverage-integration.out
103103
flags: integration
104104

105-
Acceptance:
106-
runs-on: ubuntu-latest
107-
steps:
108-
# Disabled until we figure out the "Could not resolve host: github.com" in
109-
# acceptance tests
110-
# - name: Harden Runner
111-
# uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
112-
# with:
113-
# egress-policy: audit
114-
# disable-telemetry: true
115-
116-
- name: Checkout repository
117-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
118-
119-
- name: Restore Cache
120-
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
121-
with:
122-
key: main
123-
path: '**'
124-
125-
- name: Setup Go environment
126-
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
127-
with:
128-
go-version-file: go.mod
129-
cache: false
130-
131-
- name: Update podman
132-
run: |
133-
"${GITHUB_WORKSPACE}/hack/ubuntu-podman-update.sh"
134-
135-
- name: Acceptance test
136-
run: make acceptance
137-
138-
- name: Upload coverage report
139-
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
140-
with:
141-
files: ./coverage-acceptance.out
142-
flags: acceptance
143105

144106
Tools:
145107
runs-on: ubuntu-latest

.github/workflows/checks-sealights.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
tar -xzf ./sealights-go-agent.tar.gz && tar -xzf ./sealights-slcli.tar.gz
8585
rm -f ./sealights-go-agent.tar.gz ./sealights-slcli.tar.gz
8686
./slgoagent -v 2> /dev/null | grep version && ./slcli -v 2> /dev/null | grep version
87-
87+
8888
- name: Write SeaLights token into file
8989
run: echo "${SEALIGHTS_AGENT_TOKEN}" > sltoken.txt
9090
env:
@@ -118,7 +118,7 @@ jobs:
118118
id: sealights-scan
119119
run: |
120120
echo "[Sealights] Running the SeaLights scan"
121-
./slcli scan --bsid buildSessionId.txt --path-to-scanner ./slgoagent --workspacepath ./ --scm git --scmBaseUrl https://github.com/conforma/cli.git --scmVersion “0” --scmProvider github
121+
./slcli scan --bsid buildSessionId.txt --path-to-scanner ./slgoagent --workspacepath ./ --scm git --scmBaseUrl https://github.com/conforma/cli.git --scmVersion "0" --scmProvider github
122122
echo bsid=$(< buildSessionId.txt) | tee -a "$GITHUB_OUTPUT"
123123
- name: clean all SeaLights secret stuff
124124
run: |
@@ -134,7 +134,7 @@ jobs:
134134
Test:
135135
runs-on: ubuntu-latest
136136
needs: Initialize
137-
steps:
137+
steps:
138138
- name: Restore workspace
139139
uses: actions/cache@v4
140140
with:
@@ -181,4 +181,4 @@ jobs:
181181
run: |
182182
cat ./junit-acceptance.xml
183183
./slcli test upload-reports --bsid=$BSID --report-location ./junit-acceptance.xml
184-
./slcli test end-stage --bsid=$BSID --executionId "Acceptance Tests"
184+
./slcli test end-stage --bsid=$BSID --executionId "Acceptance Tests"

0 commit comments

Comments
 (0)