Skip to content

Commit

Permalink
conditional CI execution not working - fix
Browse files Browse the repository at this point in the history
  • Loading branch information
brabster committed Oct 20, 2024
1 parent 9afe684 commit 737d0dd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/test_vars.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
git_name: Testy McTestface
git_email: [email protected]
username: tester
CI: true
2 changes: 1 addition & 1 deletion .github/workflows/test_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: |
cd $GITHUB_WORKSPACE
cp ${GITHUB_WORKSPACE}/.github/test_vars.yml ${GITHUB_WORKSPACE}/.vars.yml
ansible-playbook -e in_container=true -i inventory workstation.yml
ansible-playbook -i inventory workstation.yml
- name: check
shell: bash -l {0}
run: |
Expand Down
2 changes: 0 additions & 2 deletions roles/docker-rootless/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

- name: Disable system docker
ansible.builtin.shell: systemctl disable --now docker.service docker.socket
when: in_container is not defined

- name: Find user UID
ansible.builtin.command: 'id -u {{ username }}'
Expand All @@ -45,7 +44,6 @@
ansible.builtin.shell: |
dockerd-rootless-setuptool.sh install
systemctl --user enable docker
when: in_container is not defined
- name: Set environment variables
become: yes
Expand Down
10 changes: 5 additions & 5 deletions workstation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
- role: ./roles/pyenv
- role: ./roles/git
- role: ./roles/clamav

- role: ./roles/xfce
when: in_container is not defined # needs X11
when: not CI # needs X11

- role: ./roles/docker-rootless
when: in_container is not defined # already running in a container



when: not CI # already running in a container

0 comments on commit 737d0dd

Please sign in to comment.