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: better display in CI + introduce 'ci' context #293

Merged
merged 1 commit into from
Mar 15, 2024
Merged

ci: better display in CI + introduce 'ci' context #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 22 additions & 3 deletions .castor/docker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@ function create_default_context(): Context
'power_shell' => false,
'user_id' => posix_geteuid(),
'root_dir' => \dirname(__DIR__),
'env' => $_SERVER['CI'] ?? false ? 'ci' : 'dev',
Copy link
Member Author

@lyrixx lyrixx Mar 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does not make sens to have a "env" context when castor already has one.

];

if (file_exists($data['root_dir'] . '/infrastructure/docker/docker-compose.override.yml')) {
Expand Down Expand Up @@ -331,7 +330,28 @@ function create_default_context(): Context
$data['user_id'] = 1000;
}

return new Context($data, pty: 'dev' === $data['env']);
return new Context(
$data,
pty: Process::isPtySupported(),
environment: [
'BUILDKIT_PROGRESS' => 'plain',
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's gather all env var here, to simplify CI configuration

]
);
}

#[AsContext(name: 'ci')]
function create_ci_context(): Context
{
$c = create_default_context();

return $c
->withData([
// override the default context here
])
->withEnvironment([
'COMPOSE_ANSI' => 'never',
Copy link
Member Author

@lyrixx lyrixx Mar 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The output is cleaner with this option in this CI. And it's much more digest

but, it does not work on github 😭

edit: hooo, pretty sure docker version on GH is too old 🤯

Let's keep it for now...

])
;
}

/**
Expand All @@ -353,7 +373,6 @@ function docker_compose(array $subCommand, ?Context $c = null, bool $withBuilder
'USER_ID' => variable('user_id'),
'COMPOSER_CACHE_DIR' => variable('composer_cache_dir'),
'PHP_VERSION' => variable('php_version'),
'BUILDKIT_PROGRESS' => 'plain',
])
;

Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ name: Continuous Integration
permissions:
contents: read

env:
# Fix for symfony/color detection. We know GitHub Actions can handle it
ANSICON: 1
CASTOR_CONTEXT: ci

jobs:
check-dockerfiles:
name: Check Dockerfile
Expand All @@ -33,8 +38,6 @@ jobs:
runs-on: ubuntu-latest
env:
DS_PHP_VERSION: ${{ matrix.php-version }}
BUILDKIT_PROGRESS: plain
CI: 1
steps:
- uses: actions/checkout@v4

Expand Down