Skip to content

Commit dca917d

Browse files
committed
Only use GitLab conditionally
1 parent 55a085e commit dca917d

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

.github/workflows/integration-tests.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
name: Magento 2 Integration Tests
2-
#on: ['push', 'pull_request']
3-
on:
4-
release:
5-
push:
6-
branches:
7-
- 'main'
2+
on: ['push', 'pull_request']
83

94
jobs:
105
integration-tests:
116
name: Magento 2 Integration Tests
12-
runs-on: self-hosted
13-
#runs-on: ubuntu-latest
7+
#runs-on: self-hosted
8+
runs-on: ubuntu-latest
149
container:
1510
image: yireo/magento2installed:2.4.7-p4
1611
services:
@@ -36,13 +31,18 @@ jobs:
3631
- name: Checkout sources
3732
uses: actions/checkout@v4
3833

34+
- name: Configure GitLab
35+
run: |
36+
test -n "${{ secrets.GITLAB_TOKEN }}" || exit 0
37+
cd /tmp/magento
38+
composer config --auth gitlab-token.gitlab.yireo.com ${{ secrets.GITLAB_TOKEN }}
39+
composer config repositories.loki-checkout composer https://gitlab.yireo.com/api/v4/group/loki-checkout/-/packages/composer/packages.json
40+
3941
- name: Add module source
4042
run: |
4143
export COMPOSER_NAME=`cat .module.ini | grep COMPOSER_NAME | cut -f2 -d= | tr -d '"'`
4244
cp -R ${GITHUB_WORKSPACE} /tmp/magento/package-source
4345
cd /tmp/magento
44-
composer config --auth gitlab-token.gitlab.yireo.com ${{ secrets.GITLAB_TOKEN }}
45-
composer config repositories.loki-checkout composer https://gitlab.yireo.com/api/v4/group/loki-checkout/-/packages/composer/packages.json
4646
composer config repositories.local-source path package-source/
4747
composer require --prefer-source -- ${COMPOSER_NAME}:@dev yireo/magento2-integration-test-helper
4848

.github/workflows/unit-tests.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,19 @@ jobs:
1111
- name: Checkout sources
1212
uses: actions/checkout@v4
1313

14+
- name: Configure GitLab
15+
run: |
16+
test -n "${{ secrets.GITLAB_TOKEN }}" || exit 0
17+
cd /tmp/magento
18+
composer config --auth gitlab-token.gitlab.yireo.com ${{ secrets.GITLAB_TOKEN }}
19+
composer config repositories.loki-checkout composer https://gitlab.yireo.com/api/v4/group/loki-checkout/-/packages/composer/packages.json
20+
1421
- name: Add module source
1522
run: |
1623
export COMPOSER_NAME=`cat .module.ini | grep COMPOSER_NAME | cut -f2 -d= | tr -d '"'`
1724
test -z "$COMPOSER_NAME}" && (echo "No composer name found" && exit 1)
1825
cp -R $GITHUB_WORKSPACE /tmp/magento/package-source
1926
cd /tmp/magento
20-
composer config --auth gitlab-token.gitlab.yireo.com ${{ secrets.GITLAB_TOKEN }}
21-
composer config repositories.loki-checkout composer https://gitlab.yireo.com/api/v4/group/loki-checkout/-/packages/composer/packages.json
2227
composer config repositories.local-source path package-source/
2328
composer require --prefer-source -W -- $COMPOSER_NAME:@dev
2429

0 commit comments

Comments
 (0)