diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0ec225f..64b026bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,6 @@ on: ANSIBLE_DEBUG: type: choice description: ANSIBLE_DEBUG (true, false) - default: "false" options: - "false" - "true" @@ -54,7 +53,6 @@ on: build_upload: type: choice description: Upload release to Vagrant Cloud - default: "false" options: - "false" - "true" @@ -63,6 +61,7 @@ on: - cron: "0 1 1 * *" env: + PACKER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} PACKER_IMAGES_OUTPUT_DIR: /var/tmp/packer-templates-images PACKER_CACHE_DIR: /var/tmp/packer_cache LOGDIR: /var/tmp/packer-templates-logs @@ -196,26 +195,39 @@ jobs: - name: Install packages run: | set -euxo pipefail - # Remove unused packages to save some disk space - rm -rf /Users/runner/Library/Developer /Users/runner/Library/Android /Users/runner/hostedtoolcache /Users/runner/.dotnet - brew update - brew install bash coreutils gnu-sed jq packer hudochenkov/sshpass/sshpass vagrant + brew install ansible bash coreutils gnu-sed jq packer hudochenkov/sshpass/sshpass hashicorp/tap/hashicorp-vagrant + if [[ "${PACKER_VAGRANT_PROVIDER}" = "libvirt" ]]; then brew install qemu xorriso + qemu-system-x86_64 --version fi + if [[ "${PACKER_VAGRANT_PROVIDER}" = "virtualbox" ]]; then brew install virtualbox + vboxmanage --version fi - # renovate: datasource=pypi depName=ansible - ANSIBLE_VERSION="9.2.0" - pip3 install ansible=="${ANSIBLE_VERSION}" + + packer plugins install github.com/hashicorp/ansible + packer plugins install github.com/hashicorp/qemu + packer plugins install github.com/hashicorp/vagrant + packer plugins install github.com/hashicorp/virtualbox + + vagrant --version + packer --version + ansible --version + if [[ "${BUILD}" =~ windows ]]; then # renovate: datasource=pypi depName=pywinrm PYWINRM_VERSION="0.4.3" pip3 install pywinrm=="${PYWINRM_VERSION}" - ansible-galaxy collection install -v -r ansible/requirements.yml + ansible-galaxy collection install --force -r ansible/requirements.yml fi + echo "/usr/local/bin:/usr/local/opt/gnu-sed/libexec/gnubin:/usr/local/opt/coreutils/libexec/gnubin" >> "${GITHUB_PATH}" + + # Remove unused packages to save some disk space + rm -rf /Users/runner/Library/Developer /Users/runner/Library/Android /Users/runner/hostedtoolcache /Users/runner/.dotnet + # Used by mxschmitt/action-tmate touch continue @@ -230,12 +242,12 @@ jobs: ./build.sh "${BUILD}" - name: Upload logs to GitHub artifact store in case of VirtualBox failure - uses: actions/upload-artifact@v4 - if: ${{ always() && (steps.build_image.outcome == 'failure') && contains(matrix.stage, 'virtualbox') }} + uses: actions/upload-artifact@v3 + if: ${{ always() && contains(matrix.stage, 'virtualbox') }} with: name: ${{ matrix.stage }} path: ${{ env.LOGDIR }}/* - retention-days: 1 + retention-days: 3 - name: Check the created box image run: | diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml new file mode 100644 index 00000000..faff21af --- /dev/null +++ b/.github/workflows/release-please.yml @@ -0,0 +1,20 @@ +--- +name: release-please + +on: + workflow_dispatch: + push: + branches: + - main + +permissions: + contents: write + pull-requests: write + +jobs: + release-please-pr: + runs-on: ubuntu-latest + steps: + - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e # v4.0.2 + with: + release-type: simple diff --git a/.gitignore b/.gitignore index 3559759f..fb962e3d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,3 @@ packer_cache/ # pre-commit config file .pre-commit-config.yaml - -# release-it configuration file -.release-it.yml diff --git a/ansible/roles/ansible-role-my_common_defaults b/ansible/roles/ansible-role-my_common_defaults index 7d3d8939..f75b3880 160000 --- a/ansible/roles/ansible-role-my_common_defaults +++ b/ansible/roles/ansible-role-my_common_defaults @@ -1 +1 @@ -Subproject commit 7d3d89392553f7fd8e038c11f7a6ff278a9db8b5 +Subproject commit f75b3880dbbb98a58053be12653639722a599abb diff --git a/ansible/roles/ansible-role-virtio-win b/ansible/roles/ansible-role-virtio-win index ee01884d..79ce98e6 160000 --- a/ansible/roles/ansible-role-virtio-win +++ b/ansible/roles/ansible-role-virtio-win @@ -1 +1 @@ -Subproject commit ee01884d31251f374df9bb4e1852b762e9291d17 +Subproject commit 79ce98e619a27cdec52294b5a27275a76d8d4628