diff --git a/.github/actions/install-ubuntu-default-tools/action.yml b/.github/actions/install-ubuntu-default-tools/action.yml index 4662e6ad8..9c0d719a2 100644 --- a/.github/actions/install-ubuntu-default-tools/action.yml +++ b/.github/actions/install-ubuntu-default-tools/action.yml @@ -1,30 +1,35 @@ name: "Install Ubuntu default tools" -description: "Install common Ubuntu tools (e.g.: docker, git, zip, unzip, python3)" +description: "Install common Ubuntu tools (e.g.: docker, git, zip, unzip)" inputs: packages: description: "The list of package names to be installed separated by a whitespace" required: false + sudo: + description: "Whether to use sudo or not" + required: false + default: "true" runs: using: composite steps: - name: "Install common tools" shell: bash run: | + if [ "${{ inputs.sudo }}" = "true" ]; then + SUDO="sudo" + else + SUDO="" + fi + + $SUDO apt-get update + $SUDO apt-get install -y ca-certificates curl gnupg git zip unzip ${{ inputs.packages }} + # Install Docker as per https://docs.docker.com/engine/install/ubuntu/ - apt-get update - apt-get install ca-certificates curl gnupg -y - install -m 0755 -d /etc/apt/keyrings - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg - chmod a+r /etc/apt/keyrings/docker.gpg + $SUDO install -m 0755 -d /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | $SUDO gpg --dearmor -o /etc/apt/keyrings/docker.gpg + $SUDO chmod a+r /etc/apt/keyrings/docker.gpg echo \ "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \ - tee /etc/apt/sources.list.d/docker.list > /dev/null - apt-get update - # Additionally install git, zip and unzip, python3 - apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin git zip unzip python3 python3-pip ${{ inputs.packages }} -y - # Allow usage of "docker-compose" rather than "docker compose" in bash scripts - ln -f -s /usr/libexec/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose - # Workaround due to $HOME not being set causing issues with settings.xml installation in setup-build-java - mkdir -p /root/.m2 - cp .ci.settings.xml /root/.m2/settings.xml + $SUDO tee /etc/apt/sources.list.d/docker.list > /dev/null + $SUDO apt-get update + $SUDO apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9926a8891..7eb4d2795 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-yaml args: [--allow-multiple-documents] @@ -13,17 +13,17 @@ repos: args: ['--fix=lf'] exclude: .github/actions/send-slack-notification/tests/sample-commit-message.txt - id: end-of-file-fixer - exclude: '.github/actions/dispatch-resume-workflow/dist/*' + exclude: '.*/dist/.*' - id: trailing-whitespace - exclude: .github/actions/dispatch-resume-workflow/dist/* + exclude: '.*/dist/.*' - repo: https://github.com/sirosen/check-jsonschema - rev: 0.28.5 + rev: 0.31.0 hooks: - id: check-dependabot - id: check-github-actions - id: check-github-workflows - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.41.0 + rev: v0.43.0 hooks: - id: markdownlint - repo: local diff --git a/docs/README.md b/docs/README.md index a44bcea92..e25057e45 100644 --- a/docs/README.md +++ b/docs/README.md @@ -71,6 +71,7 @@ Here follows the list of GitHub Actions topics available in the current document - [load-release-descriptor](#load-release-descriptor) - [maven-build-and-tag](#maven-build-and-tag) - [Preview option for maven-build-and-tag](#preview-option-for-maven-build-and-tag) + - [Option to skip tests for maven-build-and-tag](#option-to-skip-tests-for-maven-build-and-tag) - [maven-deploy-file](#maven-deploy-file) - [maven-release](#maven-release) - [maven-update-pom-version](#maven-update-pom-version) @@ -936,12 +937,13 @@ Installs and cache ansible galaxy dependencies. When `pipenv` binary exists, ins ### install-ubuntu-default-tools -Install common Ubuntu tools such as docker, git, zip, unzip, python3. Meant to be used on top of self-hosted runners with vanilla ubuntu images. +Install common Ubuntu tools such as docker, git, zip, unzip. Meant to be used on +top of self-hosted runners coming with vanilla ubuntu images or the latest arm64 runners. ```yaml - uses: Alfresco/alfresco-build-tools/.github/actions/install-ubuntu-default-tools@ref with: - package-names-list: "postgresql-client" + package-names-list: "postgresql-client" # optional packages to install ``` ### jx-updatebot-pr diff --git a/version.txt b/version.txt index ad8f8733d..6fe100505 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v8.9.1 +v8.10.0