diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ef800c4..36c74cee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ jobs: name: Scripts runs-on: ubuntu-latest strategy: + fail-fast: false matrix: include: - test_script: collection @@ -33,13 +34,12 @@ jobs: name: Playbooks runs-on: ubuntu-latest strategy: + fail-fast: false matrix: include: - # TODO: This started failing on GitHub Actions. - # See: https://github.com/geerlingguy/ansible-for-devops/issues/429 - # - playbook: deployments.yml - # distro: ubuntu2004 - # test_idempotence: false + - playbook: deployments.yml + distro: ubuntu2004 + test_idempotence: false # TODO: Not easy to test in CI at this time. # - playbook: deployments-balancer.yml diff --git a/deployments/playbooks/deploy.yml b/deployments/playbooks/deploy.yml index fe689520..4ad97c6e 100644 --- a/deployments/playbooks/deploy.yml +++ b/deployments/playbooks/deploy.yml @@ -9,6 +9,12 @@ - geerlingguy.passenger tasks: + - name: Allow Git invocations in repositories owned by other users. + git_config: + name: safe.directory + scope: global + value: '*' + - name: Ensure demo application is at correct release. git: repo: https://github.com/geerlingguy/demo-rails-app.git @@ -18,8 +24,6 @@ force: true register: app_updated notify: restart nginx - become: true - become_user: "{{ app_user }}" - name: Ensure secrets file is present. template: diff --git a/deployments/playbooks/provision.yml b/deployments/playbooks/provision.yml index 6ab34c68..710e1269 100644 --- a/deployments/playbooks/provision.yml +++ b/deployments/playbooks/provision.yml @@ -19,11 +19,3 @@ - libreadline-dev - tzdata state: present - - - name: Ensure app directory exists and is writeable. - file: - path: "{{ app_directory }}" - state: directory - owner: "{{ app_user }}" - group: "{{ app_user }}" - mode: 0755 diff --git a/deployments/playbooks/vars.yml b/deployments/playbooks/vars.yml index a64f735f..1a512efa 100644 --- a/deployments/playbooks/vars.yml +++ b/deployments/playbooks/vars.yml @@ -18,8 +18,14 @@ passenger_ruby: /usr/local/bin/ruby # Variables for Ruby installation. ruby_install_from_source: true -ruby_download_url: https://cache.ruby-lang.org/pub/ruby/2.7/ruby-2.7.6.tar.gz -ruby_version: 2.7.6 +ruby_download_url: https://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.0.tar.gz +ruby_version: 2.6.0 +ruby_install_bundler: false +ruby_install_gems: + - name: bundler + version: 2.1.4 + user_install: false +ruby_install_gems_user: root # Variables for Node.js installation. nodejs_install_npm_user: root