Skip to content

Commit

Permalink
Merge commit '5e29f8a0f0f3c97c4f6e53b2509a48453276fe94' into feature/…
Browse files Browse the repository at this point in the history
…ubuntu-noble
  • Loading branch information
slabajo committed Aug 27, 2024
2 parents bff1a37 + 5e29f8a commit 456dea9
Show file tree
Hide file tree
Showing 68 changed files with 1,009 additions and 1,158 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:

- name: "Configure the environment for job script"
run: |
# Env vars used by `kurento_ci_job_deploy_java.sh`.
# Env vars used by `ci_job_deploy_java.sh`.
echo "ENV_PATH=$GITHUB_ENV" >>$GITHUB_ENV
# Path to the Maven settings.xml file.
Expand All @@ -77,7 +77,7 @@ jobs:
echo "KURENTO_MAVEN_UPLOAD_USERNAME=${{ secrets.KURENTO_MAVEN_UPLOAD_USERNAME }}" >>$GITHUB_ENV
echo "KURENTO_MAVEN_UPLOAD_PASSWORD=${{ secrets.KURENTO_MAVEN_UPLOAD_PASSWORD }}" >>$GITHUB_ENV
# Env vars used by `kurento_maven_deploy_github.sh`.
# Env vars used by `maven_deploy_github.sh`.
echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >>$GITHUB_ENV
# Env vars used by `run` steps.
Expand All @@ -87,22 +87,22 @@ jobs:
if: ${{ inputs.genModuleEnable }}
working-directory: "${{ env.WORKING_DIRECTORY }}"
run: |
kurento_ci_job_generate_module.sh --java --server-version "${{ inputs.genModuleServerVersion }}"
ci_job_generate_module.sh --java --server-version "${{ inputs.genModuleServerVersion }}"
# Change WORKING_DIRECTORY so it points to the newly generated dir.
echo "WORKING_DIRECTORY=$WORKING_DIRECTORY/build/java" >>$GITHUB_ENV
- name: "Configure the environment for job script (deploy)"
run: |
# Path to the GPG key used by `kurento_maven_deploy.sh`.
# Path to the GPG key used by `maven_deploy.sh`.
# Note: No need to clean, $RUNNER_TEMP/ is deleted after each run.
MAVEN_GPG_KEY_PATH="$RUNNER_TEMP/maven.gpg"
echo "MAVEN_GPG_KEY_PATH=$MAVEN_GPG_KEY_PATH" >>$GITHUB_ENV
echo "${{ secrets.MAVEN_PRIVATE_GPG_KEY }}" >"$MAVEN_GPG_KEY_PATH"
- name: "Run job script (deploy)"
working-directory: "${{ env.WORKING_DIRECTORY }}"
run: "kurento_ci_job_deploy_java.sh"
run: "ci_job_deploy_java.sh"

# Action: https://github.com/actions/upload-artifact
- name: "Archive the artifacts"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,29 @@ on:

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

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

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

module-core:
needs: ["maven-plugin"]
uses: "./.github/workflows/clients-java.called.yaml"
uses: "./.github/workflows/clients-java.child.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.called.yaml"
uses: "./.github/workflows/clients-java.child.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.called.yaml"
uses: "./.github/workflows/clients-java.child.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.called.yaml"
uses: "./.github/workflows/clients-java.child.yaml"
with:
directory: "clients/java/"
secrets: inherit

module-chroma:
needs: ["client"]
uses: "./.github/workflows/clients-java.called.yaml"
uses: "./.github/workflows/clients-java.child.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.called.yaml"
# uses: "./.github/workflows/clients-java.child.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.called.yaml"
uses: "./.github/workflows/clients-java.child.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.called.yaml"
# uses: "./.github/workflows/clients-java.child.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.called.yaml"
# uses: "./.github/workflows/clients-java.child.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.called.yaml"
# uses: "./.github/workflows/clients-java.child.yaml"
# with:
# directory: "server/module-examples/pointerdetector/"
# genModuleEnable: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: "Configure the environment for job script"
run: |
# Env vars used by `kurento_ci_job_deploy_js.sh`.
# Env vars used by `ci_job_deploy_js.sh`.
echo "ENV_PATH=$GITHUB_ENV" >>$GITHUB_ENV
# Commit that triggered this build.
Expand All @@ -56,14 +56,14 @@ jobs:
# Path to the Maven settings.xml file.
echo "MAVEN_SETTINGS_PATH=$GITHUB_WORKSPACE/clients/java/maven-settings/settings.xml" >>$GITHUB_ENV
# Path to the SSH key used by `kurento_generate_js_module.sh`.
# Path to the SSH key used by `generate_js_module.sh`.
# Note: No need to clean, $RUNNER_TEMP/ is deleted after each run.
GIT_SSH_KEY_PATH="$RUNNER_TEMP/id_git_ssh"
echo "GIT_SSH_KEY_PATH=$GIT_SSH_KEY_PATH" >>$GITHUB_ENV
echo "${{ secrets.KURENTOCI_PRIVATE_SSH_KEY }}" >"$GIT_SSH_KEY_PATH"
chmod 0400 "$GIT_SSH_KEY_PATH"
# Env vars used by `kurento_deploy_js_npm.sh`.
# Env vars used by `deploy_js_npm.sh`.
echo "KURENTO_NPM_TOKEN=${{ secrets.KURENTO_NPM_TOKEN }}" >>$GITHUB_ENV
# Env vars used by the Maven settings.xml file.
Expand All @@ -74,7 +74,7 @@ jobs:
echo "KURENTO_MAVEN_UPLOAD_USERNAME=${{ secrets.KURENTO_MAVEN_UPLOAD_USERNAME }}" >>$GITHUB_ENV
echo "KURENTO_MAVEN_UPLOAD_PASSWORD=${{ secrets.KURENTO_MAVEN_UPLOAD_PASSWORD }}" >>$GITHUB_ENV
# Env vars used by `kurento_maven_deploy_github.sh`.
# Env vars used by `maven_deploy_github.sh`.
echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >>$GITHUB_ENV
# Env vars used by `run` steps.
Expand All @@ -86,19 +86,19 @@ jobs:
env:
JOB_RELEASE: "${{ inputs.jobRelease }}"
run: |
kurento_ci_job_generate_module.sh --js --server-version "${{ inputs.genModuleServerVersion }}"
ci_job_generate_module.sh --js --server-version "${{ inputs.genModuleServerVersion }}"
# Change WORKING_DIRECTORY so it points to the newly generated dir.
echo "WORKING_DIRECTORY=$WORKING_DIRECTORY/build/js" >>$GITHUB_ENV
- name: "Configure the environment for job script (deploy)"
run: |
# Path to the GPG key used by `kurento_maven_deploy.sh`.
# Path to the GPG key used by `maven_deploy.sh`.
# Note: No need to clean, $RUNNER_TEMP/ is deleted after each run.
MAVEN_GPG_KEY_PATH="$RUNNER_TEMP/maven.gpg"
echo "MAVEN_GPG_KEY_PATH=$MAVEN_GPG_KEY_PATH" >>$GITHUB_ENV
echo "${{ secrets.MAVEN_PRIVATE_GPG_KEY }}" >"$MAVEN_GPG_KEY_PATH"
- name: "Run job script (deploy)"
working-directory: "${{ env.WORKING_DIRECTORY }}"
run: "kurento_ci_job_deploy_js.sh"
run: "ci_job_deploy_js.sh"
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ on:

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

module-core:
uses: "./.github/workflows/clients-javascript.called.yaml"
uses: "./.github/workflows/clients-javascript.child.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.called.yaml"
uses: "./.github/workflows/clients-javascript.child.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.called.yaml"
uses: "./.github/workflows/clients-javascript.child.yaml"
with:
jobRelease: ${{ inputs.jobRelease }}
directory: "server/module-filters/"
Expand All @@ -51,22 +51,22 @@ jobs:
secrets: inherit

jsonrpc:
uses: "./.github/workflows/clients-javascript.called.yaml"
uses: "./.github/workflows/clients-javascript.child.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.called.yaml"
uses: "./.github/workflows/clients-javascript.child.yaml"
with:
jobRelease: ${{ inputs.jobRelease }}
directory: "clients/javascript/client/"
secrets: inherit

module-chroma:
uses: "./.github/workflows/clients-javascript.called.yaml"
uses: "./.github/workflows/clients-javascript.child.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.called.yaml"
uses: "./.github/workflows/clients-javascript.child.yaml"
with:
jobRelease: ${{ inputs.jobRelease }}
directory: "server/module-examples/datachannelexample/"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/doc-kurento.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ jobs:
- name: "Configure the environment for job script"
run: |
# Env vars used by `kurento_ci_job_deploy_doc.sh`.
# Env vars used by `ci_job_deploy_doc.sh`.
echo "ENV_PATH=$GITHUB_ENV" >>$GITHUB_ENV
# Commit that triggered this build. Used by `kurento_doc_deploy.sh`.
# Commit that triggered this build. Used by `doc_deploy.sh`.
echo "GIT_HASH_SHORT=${GITHUB_SHA:0:7}" >>$GITHUB_ENV
# Path to the SSH key. Used by `kurento_doc_deploy.sh`.
# Path to the SSH key. Used by `doc_deploy.sh`.
# Note: No need to clean, $RUNNER_TEMP/ is deleted after each run.
GIT_SSH_KEY_PATH="$RUNNER_TEMP/id_git_ssh"
echo "GIT_SSH_KEY_PATH=$GIT_SSH_KEY_PATH" >>$GITHUB_ENV
Expand All @@ -55,4 +55,4 @@ jobs:
- name: "Run job script"
env:
JOB_RELEASE: "${{ inputs.jobRelease }}"
run: "kurento_ci_job_deploy_doc.sh"
run: "ci_job_deploy_doc.sh"
2 changes: 1 addition & 1 deletion .github/workflows/docker-kurento-buildpackage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ jobs:
KURENTO_DOCKERHUB_USERNAME: "${{ secrets.KURENTO_DOCKERHUB_USERNAME }}"
KURENTO_DOCKERHUB_TOKEN: "${{ secrets.KURENTO_DOCKERHUB_TOKEN }}"
working-directory: docker/kurento-buildpackage/
run: kurento_container_build.sh
run: container_build.sh
2 changes: 1 addition & 1 deletion .github/workflows/docker-kurento-ci-buildtools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ jobs:
KURENTO_DOCKERHUB_USERNAME: "${{ secrets.KURENTO_DOCKERHUB_USERNAME }}"
KURENTO_DOCKERHUB_TOKEN: "${{ secrets.KURENTO_DOCKERHUB_TOKEN }}"
working-directory: docker/kurento-ci-buildtools/
run: kurento_container_build.sh
run: container_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
DISABLE_APT_PROXY: "true"
INSTALL_PATH: "${{ steps.copy-artifacts.outputs.download-path }}"
working-directory: "${{ inputs.directory }}"
run: "kurento_ci_job_package_debian.sh"
run: "ci_job_package_debian.sh"

# Action: https://github.com/actions/upload-artifact
- name: "Archive the artifacts"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ jobs:
env:
JOB_RELEASE: "${{ inputs.jobRelease }}"
working-directory: "artifacts/"
run: "kurento_ci_job_deploy_aws_cf.sh"
run: "ci_job_deploy_aws_cf.sh"
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:

- name: "Configure the environment for job script"
run: |
# Path to the SSH key used by `kurento_ci_job_deploy_debian.sh`.
# Path to the SSH key used by `ci_job_deploy_debian.sh`.
# Note: No need to clean, $RUNNER_TEMP/ is deleted after each run.
APTLY_SSH_KEY_PATH="$RUNNER_TEMP/id_aptly_ssh"
echo "APTLY_SSH_KEY_PATH=$APTLY_SSH_KEY_PATH" >>$GITHUB_ENV
Expand All @@ -76,4 +76,4 @@ jobs:
JOB_DEPLOY_NAME: "${{ inputs.jobDeployName }}"
APTLY_GPG_SUBKEY: "${{ vars.APTLY_GPG_SUBKEY }}"
working-directory: "artifacts/"
run: "kurento_ci_job_deploy_debian.sh"
run: "ci_job_deploy_debian.sh"
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
KURENTO_DOCKERHUB_USERNAME: "${{ secrets.KURENTO_DOCKERHUB_USERNAME }}"
KURENTO_DOCKERHUB_TOKEN: "${{ secrets.KURENTO_DOCKERHUB_TOKEN }}"
working-directory: "docker/kurento-media-server/"
run: "kurento_ci_job_deploy_docker.sh"
run: "ci_job_deploy_docker.sh"

- name: "Run job script (AddressSanitizer)"
if: ${{ inputs.buildAsan }}
Expand All @@ -92,4 +92,4 @@ jobs:
KURENTO_DOCKERHUB_USERNAME: "${{ secrets.KURENTO_DOCKERHUB_USERNAME }}"
KURENTO_DOCKERHUB_TOKEN: "${{ secrets.KURENTO_DOCKERHUB_TOKEN }}"
working-directory: "docker/kurento-media-server-asan/"
run: "kurento_ci_job_deploy_docker_asan.sh"
run: "ci_job_deploy_docker_asan.sh"
Loading

0 comments on commit 456dea9

Please sign in to comment.