Skip to content

Commit

Permalink
.github: Workflow file renames that were pending commit
Browse files Browse the repository at this point in the history
Some normalization of the files, to follow docs on Reusable Commits,
which call them "caller" and "called" workflows.

Also, closer follow of the same directory path in the workflow names.
So, the workflow for "clients/java" is called exactly like that, and
this applies to all workflows. Exception for javascript: "js" is used as
a shorthand.

Also no need to use a generic word like "build" in names. It doesn't say
anything we didn't know, of course most CI jobs are for "building"
things.
  • Loading branch information
j1elo committed Nov 28, 2023
1 parent 4d24b44 commit eb09952
Show file tree
Hide file tree
Showing 15 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/000-template.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Workflow template"
name: "workflow template"

on:
# Manual trigger.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/001-playground.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Workflow used to play with Actions syntax.
name: "GitHub: Workflow playground"
# Workflow used to experiment with GitHub Actions syntax.
name: "workflow playground"

on:
# Triggered manually.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Information of interest that is common for all workflows:

- [Workflow syntax](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions)
- [Workflow commands](https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions)
- [Docker actions](https://docs.docker.com/build/ci/github-actions/)
- [Reusable workflows](https://docs.github.com/en/actions/using-workflows/reusing-workflows)

* Advanced:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Clients: Build Java module (Reusable workflow)"
name: "clients/java module (child)"

on:
# Triggered from other workflows.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Clients: Build All Java (Parent)"
name: "clients/java all (parent)"

on:
# Triggered manually.
Expand All @@ -12,29 +12,29 @@ on:

jobs:
qa-pom:
uses: "./.github/workflows/clients-java-build.reusable.yaml"
uses: "./.github/workflows/clients-java.called.yaml"
with:
directory: "clients/java/qa-pom/"
copyArtifacts: false
secrets: inherit

module-creator:
uses: "./.github/workflows/clients-java-build.reusable.yaml"
uses: "./.github/workflows/clients-java.called.yaml"
with:
directory: "server/module-creator/"
copyArtifacts: false
secrets: inherit

maven-plugin:
needs: ["module-creator"]
uses: "./.github/workflows/clients-java-build.reusable.yaml"
uses: "./.github/workflows/clients-java.called.yaml"
with:
directory: "clients/java/maven-plugin/"
secrets: inherit

module-core:
needs: ["maven-plugin"]
uses: "./.github/workflows/clients-java-build.reusable.yaml"
uses: "./.github/workflows/clients-java.called.yaml"
with:
directory: "server/module-core/"
genModuleEnable: true
Expand All @@ -43,7 +43,7 @@ jobs:

module-elements:
needs: ["module-core"]
uses: "./.github/workflows/clients-java-build.reusable.yaml"
uses: "./.github/workflows/clients-java.called.yaml"
with:
directory: "server/module-elements/"
genModuleEnable: true
Expand All @@ -52,7 +52,7 @@ jobs:

module-filters:
needs: ["module-elements"]
uses: "./.github/workflows/clients-java-build.reusable.yaml"
uses: "./.github/workflows/clients-java.called.yaml"
with:
directory: "server/module-filters/"
genModuleEnable: true
Expand All @@ -61,14 +61,14 @@ jobs:

client:
needs: ["qa-pom", "module-filters"]
uses: "./.github/workflows/clients-java-build.reusable.yaml"
uses: "./.github/workflows/clients-java.called.yaml"
with:
directory: "clients/java/"
secrets: inherit

module-chroma:
needs: ["client"]
uses: "./.github/workflows/clients-java-build.reusable.yaml"
uses: "./.github/workflows/clients-java.called.yaml"
with:
directory: "server/module-examples/chroma/"
genModuleEnable: true
Expand All @@ -78,7 +78,7 @@ jobs:
# Unavailable since Kurento 7.0.0
#module-crowddetector:
# needs: ["client"]
# uses: "./.github/workflows/clients-java-build.reusable.yaml"
# uses: "./.github/workflows/clients-java.called.yaml"
# with:
# directory: "server/module-examples/crowddetector/"
# genModuleEnable: true
Expand All @@ -87,7 +87,7 @@ jobs:

module-datachannelexample:
needs: ["client"]
uses: "./.github/workflows/clients-java-build.reusable.yaml"
uses: "./.github/workflows/clients-java.called.yaml"
with:
directory: "server/module-examples/datachannelexample/"
genModuleEnable: true
Expand All @@ -97,7 +97,7 @@ jobs:
# Unavailable since Kurento 7.0.0
#module-markerdetector:
# needs: ["client"]
# uses: "./.github/workflows/clients-java-build.reusable.yaml"
# uses: "./.github/workflows/clients-java.called.yaml"
# with:
# directory: "server/module-examples/markerdetector/"
# genModuleEnable: true
Expand All @@ -107,7 +107,7 @@ jobs:
# Unavailable since Kurento 7.0.0
#module-platedetector:
# needs: ["client"]
# uses: "./.github/workflows/clients-java-build.reusable.yaml"
# uses: "./.github/workflows/clients-java.called.yaml"
# with:
# directory: "server/module-examples/platedetector/"
# genModuleEnable: true
Expand All @@ -117,7 +117,7 @@ jobs:
# Unavailable since Kurento 7.0.0
#module-pointerdetector:
# needs: ["client"]
# uses: "./.github/workflows/clients-java-build.reusable.yaml"
# uses: "./.github/workflows/clients-java.called.yaml"
# with:
# directory: "server/module-examples/pointerdetector/"
# genModuleEnable: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Clients: Build JavaScript module (Reusable workflow)"
name: "clients/js module (child)"

on:
# Triggered from other workflows.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Clients: Build All JavaScript (Parent)"
name: "clients/js all (parent)"

on:
# Triggered manually.
Expand All @@ -17,14 +17,14 @@ on:

jobs:
kurento-utils-js:
uses: "./.github/workflows/clients-javascript-build.reusable.yaml"
uses: "./.github/workflows/clients-javascript.called.yaml"
with:
jobRelease: ${{ inputs.jobRelease }}
directory: "browser/kurento-utils-js/"
secrets: inherit

module-core:
uses: "./.github/workflows/clients-javascript-build.reusable.yaml"
uses: "./.github/workflows/clients-javascript.called.yaml"
with:
jobRelease: ${{ inputs.jobRelease }}
directory: "server/module-core/"
Expand All @@ -33,7 +33,7 @@ jobs:
secrets: inherit

module-elements:
uses: "./.github/workflows/clients-javascript-build.reusable.yaml"
uses: "./.github/workflows/clients-javascript.called.yaml"
with:
jobRelease: ${{ inputs.jobRelease }}
directory: "server/module-elements/"
Expand All @@ -42,7 +42,7 @@ jobs:
secrets: inherit

module-filters:
uses: "./.github/workflows/clients-javascript-build.reusable.yaml"
uses: "./.github/workflows/clients-javascript.called.yaml"
with:
jobRelease: ${{ inputs.jobRelease }}
directory: "server/module-filters/"
Expand All @@ -51,22 +51,22 @@ jobs:
secrets: inherit

jsonrpc:
uses: "./.github/workflows/clients-javascript-build.reusable.yaml"
uses: "./.github/workflows/clients-javascript.called.yaml"
with:
jobRelease: ${{ inputs.jobRelease }}
directory: "clients/javascript/jsonrpc/"
secrets: inherit

client:
needs: ["module-core", "module-elements", "module-filters", "jsonrpc"]
uses: "./.github/workflows/clients-javascript-build.reusable.yaml"
uses: "./.github/workflows/clients-javascript.called.yaml"
with:
jobRelease: ${{ inputs.jobRelease }}
directory: "clients/javascript/client/"
secrets: inherit

module-chroma:
uses: "./.github/workflows/clients-javascript-build.reusable.yaml"
uses: "./.github/workflows/clients-javascript.called.yaml"
with:
jobRelease: ${{ inputs.jobRelease }}
directory: "server/module-examples/chroma/"
Expand All @@ -77,7 +77,7 @@ jobs:
#module-crowddetector:

module-datachannelexample:
uses: "./.github/workflows/clients-javascript-build.reusable.yaml"
uses: "./.github/workflows/clients-javascript.called.yaml"
with:
jobRelease: ${{ inputs.jobRelease }}
directory: "server/module-examples/datachannelexample/"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc-kurento.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Documentation build"
name: "doc-kurento"

on:
# Manual trigger.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-kurento-buildpackage.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Docker: Build kurento-buildpackage"
name: "docker/kurento-buildpackage"

on:
# Manual trigger.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-kurento-ci-buildtools.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Docker: Build kurento-ci-buildtools"
name: "docker/kurento-ci-buildtools"

on:
# Manual trigger.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Server: Build module (Reusable workflow)"
name: "server module (child)"

on:
# Triggered from other workflows.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Server: Deploy AWS CloudFormation"
name: "server deploy aws (child)"

on:
# Triggered from other workflows.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Server: Deploy DEB"
name: "server deploy debian (child)"

on:
# Triggered from other workflows.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Server: Deploy Docker"
name: "server deploy docker (child)"

on:
# Triggered from other workflows.
Expand All @@ -12,7 +12,7 @@ on:
type: "string"
default: '["focal"]'
jobRelease:
description: "jobRelease: Enable to build release versions Disable for development builds"
description: "jobRelease: Enable to build release versions; disable for development builds"
required: false
type: "boolean"
default: false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Server: Build All (Parent)"
name: "server all (parent)"

on:
# Triggered manually.
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
jobRelease: ${{ inputs.jobRelease }}

module-creator:
uses: "./.github/workflows/server-buildpackage.reusable.yaml"
uses: "./.github/workflows/server-buildpackage.called.yaml"
with:
jobDistros: "${{ inputs.jobDistros }}"
jobGitName: "${{ inputs.jobGitName }}"
Expand All @@ -90,7 +90,7 @@ jobs:
copyArtifacts: false

cmake-utils:
uses: "./.github/workflows/server-buildpackage.reusable.yaml"
uses: "./.github/workflows/server-buildpackage.called.yaml"
with:
jobDistros: "${{ inputs.jobDistros }}"
jobGitName: "${{ inputs.jobGitName }}"
Expand All @@ -101,7 +101,7 @@ jobs:

jsonrpc:
needs: ["cmake-utils"]
uses: "./.github/workflows/server-buildpackage.reusable.yaml"
uses: "./.github/workflows/server-buildpackage.called.yaml"
with:
jobDistros: "${{ inputs.jobDistros }}"
jobGitName: "${{ inputs.jobGitName }}"
Expand All @@ -111,7 +111,7 @@ jobs:

module-core:
needs: ["module-creator", "cmake-utils", "jsonrpc"]
uses: "./.github/workflows/server-buildpackage.reusable.yaml"
uses: "./.github/workflows/server-buildpackage.called.yaml"
with:
jobDistros: "${{ inputs.jobDistros }}"
jobGitName: "${{ inputs.jobGitName }}"
Expand All @@ -121,7 +121,7 @@ jobs:

module-elements:
needs: ["openh264-gst-plugin", "libnice", "module-core"]
uses: "./.github/workflows/server-buildpackage.reusable.yaml"
uses: "./.github/workflows/server-buildpackage.called.yaml"
with:
jobDistros: "${{ inputs.jobDistros }}"
jobGitName: "${{ inputs.jobGitName }}"
Expand All @@ -131,7 +131,7 @@ jobs:

module-filters:
needs: ["module-elements"]
uses: "./.github/workflows/server-buildpackage.reusable.yaml"
uses: "./.github/workflows/server-buildpackage.called.yaml"
with:
jobDistros: "${{ inputs.jobDistros }}"
jobGitName: "${{ inputs.jobGitName }}"
Expand All @@ -141,7 +141,7 @@ jobs:

media-server:
needs: ["libsrtp", "gst-plugins-good", "module-filters"]
uses: "./.github/workflows/server-buildpackage.reusable.yaml"
uses: "./.github/workflows/server-buildpackage.called.yaml"
with:
jobDistros: "${{ inputs.jobDistros }}"
jobGitName: "${{ inputs.jobGitName }}"
Expand All @@ -151,7 +151,7 @@ jobs:

module-chroma:
needs: ["module-filters"]
uses: "./.github/workflows/server-buildpackage.reusable.yaml"
uses: "./.github/workflows/server-buildpackage.called.yaml"
with:
jobDistros: "${{ inputs.jobDistros }}"
jobGitName: "${{ inputs.jobGitName }}"
Expand All @@ -161,7 +161,7 @@ jobs:

module-datachannelexample:
needs: ["module-filters"]
uses: "./.github/workflows/server-buildpackage.reusable.yaml"
uses: "./.github/workflows/server-buildpackage.called.yaml"
with:
jobDistros: "${{ inputs.jobDistros }}"
jobGitName: "${{ inputs.jobGitName }}"
Expand All @@ -171,7 +171,7 @@ jobs:

deploy-deb:
needs: ["media-server", "module-chroma", "module-datachannelexample"]
uses: "./.github/workflows/server-deploy-debian.reusable.yaml"
uses: "./.github/workflows/server-deploy-debian.called.yaml"
with:
jobDistros: "${{ inputs.jobDistros }}"
jobRelease: ${{ inputs.jobRelease }}
Expand All @@ -181,7 +181,7 @@ jobs:

deploy-docker:
needs: ["deploy-deb"]
uses: "./.github/workflows/server-deploy-docker.reusable.yaml"
uses: "./.github/workflows/server-deploy-docker.called.yaml"
with:
jobDistros: "${{ inputs.jobDistros }}"
jobRelease: ${{ inputs.jobRelease }}
Expand All @@ -194,6 +194,6 @@ jobs:
# TODO: Move script to use Kurento ci-scripts/ and not openvidu ci-scripts/
# deploy-aws:
# needs: ["media-server"]
# uses: "./.github/workflows/server-deploy-aws.reusable.yaml"
# uses: "./.github/workflows/server-deploy-aws.called.yaml"
# with:
# jobRelease: ${{ inputs.jobRelease }}

0 comments on commit eb09952

Please sign in to comment.