Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: install docker-compose #1751

Merged
merged 4 commits into from
Apr 2, 2024
Merged

ci: install docker-compose #1751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6457125
ci: install docker-compose
sjinks Apr 2, 2024
8fc30fa
fix: install docker-compose from github, not from apt repo
sjinks Apr 2, 2024
27d9bbf
test: fix E2E tests for composer v2
sjinks Apr 2, 2024
eac2850
Merge pull request #1752 from Automattic/fix/e2e
sjinks Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/devenv-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ jobs:
- name: Pack and install
run: npm pack && npm i -g *.tgz

- name: Install docker-compose
run: sudo curl -SL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose && sudo chmod 0755 /usr/local/bin/docker-compose

- name: Preload Docker images
run: |
vip dev-env create --app-code image --php 8.0 --mu-plugins image -e false -p true --mailpit true --photon true && \
Expand Down
7 changes: 3 additions & 4 deletions __tests__/devenv-e2e/011-logs.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe( 'vip dev-env logs', () => {
true
);
expect( result.rc ).toBe( 0 );
expect( result.stdout ).toMatch( /database_1/ );
expect( result.stdout ).toMatch( /database[_-]1/ );
expect( result.stdout ).toMatch( /STARTING UP/ );
} );

Expand All @@ -93,9 +93,8 @@ describe( 'vip dev-env logs', () => {
{ env }
);
expect( result.rc ).toBeGreaterThan( 0 );
console.log( result.stderr );
expect( result.stderr ).toContain(
"Error: Service 'foobar' not found. Please choose from one: devtools, nginx, php, database, memcached, wordpress, vip-mu-plugins, demo-app-code"
"Error: Service 'foobar' not found. Please choose from one:"
);
} );

Expand All @@ -106,7 +105,7 @@ describe( 'vip dev-env logs', () => {
true
);
expect( result.rc ).toBe( 0 );
expect( result.stdout ).toMatch( /php_1/ );
expect( result.stdout ).toMatch( /php[_-]1/ );
} );
} );
} );