Skip to content

Commit 15b441e

Browse files
Merge pull request #495 from gitlabhq/bugfix/acctest-not-running
Fix unit and acceptance tests not running
2 parents d27ff9d + 4a4c13e commit 15b441e

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

.github/workflows/acceptance-tests.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
# https://help.github.com/en/actions/reference/workflow-commands-for-github-actions
1919
- name: Set build variables
2020
run: |
21-
echo "MAKE_TARGET=testacc >> $GITHUB_ENV"
22-
echo "GO_FLAGS=-mod=vendor >> $GITHUB_ENV"
23-
echo "GO111MODULE=on >> $GITHUB_ENV"
24-
echo "GITLAB_TOKEN=20char-testing-token >> $GITHUB_ENV"
25-
echo "GITLAB_BASE_URL=http://127.0.0.1:8080/api/v4 >> $GITHUB_ENV"
21+
echo "MAKE_TARGET=testacc" >> $GITHUB_ENV
22+
echo "GO_FLAGS=-mod=vendor" >> $GITHUB_ENV
23+
echo "GO111MODULE=on" >> $GITHUB_ENV
24+
echo "GITLAB_TOKEN=20char-testing-token" >> $GITHUB_ENV
25+
echo "GITLAB_BASE_URL=http://127.0.0.1:8080/api/v4" >> $GITHUB_ENV
2626
2727
- name: Start Gitlab and run acceptance tests
2828
run: |
@@ -50,17 +50,17 @@ jobs:
5050
[[ -n "${{ secrets.LICENSE_ENCRYPTION_PASSWORD }}" ]] && echo decrypt
5151
[[ -n "${{ secrets.LICENSE_ENCRYPTION_PASSWORD }}" ]] && openssl enc -d -aes-256-cbc -pbkdf2 -iter 20000 -in Gitlab-license.encrypted -out license/Gitlab-license.txt -pass "pass:${{ secrets.LICENSE_ENCRYPTION_PASSWORD }}"
5252
chmod 666 license/Gitlab-license.txt || true
53-
echo "GITLAB_LICENSE_FILE=Gitlab-license.txt >> $GITHUB_ENV"
53+
echo "GITLAB_LICENSE_FILE=Gitlab-license.txt" >> $GITHUB_ENV
5454
5555
# https://help.github.com/en/actions/reference/workflow-commands-for-github-actions
5656
- name: Set build variables
5757
run: |
58-
echo "MAKE_TARGET=testacc >> $GITHUB_ENV"
59-
echo "GO_FLAGS=-mod=vendor >> $GITHUB_ENV"
60-
echo "GO111MODULE=on >> $GITHUB_ENV"
61-
echo "GITLAB_TOKEN=20char-testing-token >> $GITHUB_ENV"
62-
echo "GITLAB_BASE_URL=http://127.0.0.1:8080/api/v4 >> $GITHUB_ENV"
63-
echo "TF_LOG=DEBUG"
58+
echo "MAKE_TARGET=testacc" >> $GITHUB_ENV
59+
echo "GO_FLAGS=-mod=vendor" >> $GITHUB_ENV
60+
echo "GO111MODULE=on" >> $GITHUB_ENV
61+
echo "GITLAB_TOKEN=20char-testing-token" >> $GITHUB_ENV
62+
echo "GITLAB_BASE_URL=http://127.0.0.1:8080/api/v4" >> $GITHUB_ENV
63+
echo "TF_LOG=DEBUG" >> $GITHUB_ENV
6464
6565
- name: Start Gitlab and run acceptance tests
6666
run: |

.github/workflows/unit-tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
# https://help.github.com/en/actions/reference/workflow-commands-for-github-actions
2525
- name: Set build variables
2626
run: |
27-
echo "MAKE_TARGET=${{ matrix.make_target }}"
28-
echo "GO_FLAGS=-mod=vendor"
29-
echo "GO111MODULE=on"
27+
echo "MAKE_TARGET=${{ matrix.make_target }}" >> $GITHUB_ENV
28+
echo "GO_FLAGS=-mod=vendor" >> $GITHUB_ENV
29+
echo "GO111MODULE=on" >> $GITHUB_ENV
3030
3131
- name: Run ${{matrix.make_target}}
3232
run: |

0 commit comments

Comments
 (0)