Skip to content

Commit 3484816

Browse files
committed
ci: Interoptest-suite must compare to target
1 parent 835d4b8 commit 3484816

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ main, v3 ]
88

99
jobs:
1010
build:

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ main, v3 ]
88

99
jobs:
1010
test:

.github/workflows/ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ main, v3 ]
88

99
jobs:
1010
build:

.github/workflows/sop-test-suite.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: SOP interoperability test suite
22

33
on:
44
pull_request:
5-
branches: [ main ]
5+
branches: [ main, v3 ]
66

77
jobs:
88

@@ -23,23 +23,23 @@ jobs:
2323
name: gosop-${{ github.sha }}
2424
path: ./gosop-${{ github.sha }}
2525

26-
build-gosop-main:
27-
name: Build gosop from main
26+
build-gosop-target:
27+
name: Build gosop from target
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Checkout
3131
uses: actions/checkout@v3
3232
- name: Build gosop from branch
3333
uses: ./.github/actions/build-gosop
3434
with:
35-
gopenpgp-ref: main
36-
binary-location: ./gosop-main
35+
gopenpgp-ref: ${{ github.base_ref }}
36+
binary-location: ./gosop-target
3737
# Upload as artifact
38-
- name: Upload gosop-main artifact
38+
- name: Upload gosop-target artifact
3939
uses: actions/upload-artifact@v3
4040
with:
41-
name: gosop-main
42-
path: ./gosop-main
41+
name: gosop-target
42+
path: ./gosop-target
4343

4444

4545
test-suite:
@@ -52,20 +52,20 @@ jobs:
5252
password: ${{ secrets.github_token }}
5353
needs:
5454
- build-gosop
55-
- build-gosop-main
55+
- build-gosop-target
5656
steps:
5757
- name: Checkout
5858
uses: actions/checkout@v3
59-
# Fetch gosop from main
60-
- name: Download gosop-main
59+
# Fetch gosop from target
60+
- name: Download gosop-target
6161
uses: actions/download-artifact@v3
6262
with:
63-
name: gosop-main
64-
# Test gosop-main
65-
- name: Make gosop-main executable
66-
run: chmod +x gosop-main
67-
- name: Print gosop-main version
68-
run: ./gosop-main version --extended
63+
name: gosop-target
64+
# Test gosop-target
65+
- name: Make gosop-target executable
66+
run: chmod +x gosop-target
67+
- name: Print gosop-target version
68+
run: ./gosop-target version --extended
6969
# Fetch gosop from branch
7070
- name: Download gosop-branch
7171
uses: actions/download-artifact@v3
@@ -80,7 +80,7 @@ jobs:
8080
run: ./gosop-branch version --extended
8181
# Run test suite
8282
- name: Prepare test configuration
83-
run: ./.github/test-suite/prepare_config.sh $CONFIG_TEMPLATE $CONFIG_OUTPUT $GITHUB_WORKSPACE/gosop-branch $GITHUB_WORKSPACE/gosop-main
83+
run: ./.github/test-suite/prepare_config.sh $CONFIG_TEMPLATE $CONFIG_OUTPUT $GITHUB_WORKSPACE/gosop-branch $GITHUB_WORKSPACE/gosop-target
8484
env:
8585
CONFIG_TEMPLATE: .github/test-suite/config.json.template
8686
CONFIG_OUTPUT: .github/test-suite/config.json
@@ -104,8 +104,8 @@ jobs:
104104
name: test-suite-results.html
105105
path: .github/test-suite/test-suite-results.html
106106

107-
compare-with-main:
108-
name: Compare with main
107+
compare-with-target:
108+
name: Compare with target
109109
runs-on: ubuntu-latest
110110
needs: test-suite
111111
steps:
@@ -121,5 +121,5 @@ jobs:
121121
with:
122122
results: ${{ steps.download-test-results.outputs.download-path }}/test-suite-results.json
123123
output: baseline-comparison.json
124-
baseline: gosop-main
124+
baseline: gosop-target
125125
target: gosop-branch

0 commit comments

Comments
 (0)