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.

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 workflows refactoring #49

Merged
merged 10 commits into from
Jan 21, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
renamed dotnet_distro => docker_distro
arturcic committed Jan 20, 2025
commit f969e40c2b5ec2ff1a16fd8459e29abc8fc44506
2 changes: 1 addition & 1 deletion .github/actions/build-deps-manifest/action.yml
Original file line number Diff line number Diff line change
@@ -32,5 +32,5 @@ runs:
run: |
dotnet run/build.dll `
--target=DockerBuildDepsManifest `
--dotnet_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
--docker_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
--push_images=${{ env.PUSH_IMAGES }} --verbosity=diagnostic
2 changes: 1 addition & 1 deletion .github/actions/build-deps/action.yml
Original file line number Diff line number Diff line change
@@ -35,5 +35,5 @@ runs:
run: |
dotnet run/build.dll `
--target=DockerBuildDeps --arch=${{ inputs.arch }} `
--dotnet_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
--docker_distro=${{ inputs.docker_distro }} --docker_registry=${{ inputs.docker_registry_name }} `
--push_images=${{ env.PUSH_IMAGES }} --verbosity=diagnostic
8 changes: 4 additions & 4 deletions .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ jobs:
dotnet run/build.dll `
--target=DockerBuildImages --arch=${{ matrix.arch }} `
--dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
--dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub `
--docker_distro=${{ matrix.distro }} --docker_registry=dockerhub `
--push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
- name: Login to GitHub Container Registry
if: success() && env.PUSH_IMAGES == 'true'
@@ -110,7 +110,7 @@ jobs:
dotnet run/build.dll `
--target=DockerBuildImages --arch=${{ matrix.arch }} `
--dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
--dotnet_distro=${{ matrix.distro }} --docker_registry=github `
--docker_distro=${{ matrix.distro }} --docker_registry=github `
--push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic

build_images_manifest:
@@ -164,7 +164,7 @@ jobs:
dotnet run/build.dll `
--target=DockerBuildImagesManifest `
--dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
--dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub `
--docker_distro=${{ matrix.distro }} --docker_registry=dockerhub `
--push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
- name: Login to GitHub Container Registry
if: success() && env.PUSH_IMAGES == 'true'
@@ -179,5 +179,5 @@ jobs:
dotnet run/build.dll `
--target=DockerBuildImagesManifest `
--dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
--dotnet_distro=${{ matrix.distro }} --docker_registry=github `
--docker_distro=${{ matrix.distro }} --docker_registry=github `
--push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
2 changes: 1 addition & 1 deletion build/.run/DockerBuild (runtime).run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="DockerBuild (runtime)" type="DotNetProject" factoryName=".NET Project">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=8.0 --dotnet_variant=runtime --dotnet_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=8.0 --dotnet_variant=runtime --docker_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
2 changes: 1 addition & 1 deletion build/.run/DockerBuild (sdk).run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="DockerBuild (sdk)" type="DotNetProject" factoryName=".NET Project">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=8.0 --dotnet_variant=sdk --dotnet_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic --push_images=true" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=8.0 --dotnet_variant=sdk --docker_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic --push_images=true" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
2 changes: 1 addition & 1 deletion build/.run/DockerBuild.run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="DockerBuild" type="DotNetProject" factoryName=".NET Project">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --docker_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
2 changes: 1 addition & 1 deletion build/.run/DockerBuildDeps (dockerhub).run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="DockerBuildDeps (dockerhub)" type="DotNetProject" factoryName=".NET Project">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --dotnet_distro=alpine.3.20 --docker_registry=dockerhub --verbosity=diagnostic --push_images=true" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --docker_distro=alpine.3.20 --docker_registry=dockerhub --verbosity=diagnostic --push_images=true" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
2 changes: 1 addition & 1 deletion build/.run/DockerBuildDeps (gihub).run.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="DockerBuildDeps (gihub)" type="DotNetProject" factoryName=".NET Project">
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --dotnet_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic --push_images=true" />
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuildDeps --docker_distro=alpine.3.20 --docker_registry=github --verbosity=diagnostic --push_images=true" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
2 changes: 1 addition & 1 deletion build/build/Infra/BuildLifetime.cs
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ public override void Setup(BuildContext context, ISetupContext info)
var dockerRegistry = context.Argument("docker_registry", "").ToLower();
var dotnetVersion = context.Argument("dotnet_version", "").ToLower();
var dotnetVariant = context.Argument("dotnet_variant", "").ToLower();
var dockerDistro = context.Argument("dotnet_distro", "").ToLower();
var dockerDistro = context.Argument("docker_distro", "").ToLower();
var pushImages = context.Argument("push_images", false);

context.Information($"Building for Version: {dotnetVersion}, Variant: {dotnetVariant}, Distro: {dockerDistro}, Push: {pushImages}");