From fc0657747d1994d68b7f0439e88dc1923dcc0ead Mon Sep 17 00:00:00 2001 From: mg Date: Fri, 16 Jul 2021 12:43:31 +0200 Subject: [PATCH] Bugfix: git stash (#157) Bugfix: git stash Co-authored-by: Michael Grote Reviewed-on: https://git.mgrote.net/mg/ansible/pulls/157 Co-Authored-By: mg Co-Committed-By: mg --- .../mgrote.docker-compose-deploy/tasks/dockercompose.yml | 8 -------- roles/mgrote.dotfiles/tasks/main.yml | 8 -------- 2 files changed, 16 deletions(-) diff --git a/roles/mgrote.docker-compose-deploy/tasks/dockercompose.yml b/roles/mgrote.docker-compose-deploy/tasks/dockercompose.yml index da7245cb..a8d02cc6 100644 --- a/roles/mgrote.docker-compose-deploy/tasks/dockercompose.yml +++ b/roles/mgrote.docker-compose-deploy/tasks/dockercompose.yml @@ -10,7 +10,6 @@ chdir: "{{ docker_compose_base_dir }}/{{ item.dir_name }}" changed_when: false when: repo_exists.stat.exists == true - register: stashed - name: clone public repository - "{{ item.name }}" ansible.builtin.git: @@ -18,13 +17,6 @@ dest: "{{ docker_compose_base_dir }}/{{ item.dir_name }}" register: repo - - name: pop stashed changes - ansible.builtin.shell: git stash pop - args: - chdir: "{{ docker_compose_base_dir }}/{{ item.dir_name }}" - changed_when: false - when: stashed.changed - - name: (re)start container - "{{ item.name }}" ansible.builtin.shell: docker-compose down && docker-compose up -d args: diff --git a/roles/mgrote.dotfiles/tasks/main.yml b/roles/mgrote.dotfiles/tasks/main.yml index 8e989ec0..36ae2578 100644 --- a/roles/mgrote.dotfiles/tasks/main.yml +++ b/roles/mgrote.dotfiles/tasks/main.yml @@ -16,7 +16,6 @@ chdir: "{{ dotfiles_repo_path }}" changed_when: false when: repo_exists.stat.exists == true - register: stashed - name: Ensure dotfiles repository is cloned locally. git: @@ -25,13 +24,6 @@ depth: 1 register: git_clone - - name: pop stashed changes - ansible.builtin.shell: git stash pop - args: - chdir: "{{ dotfiles_repo_path }}" - changed_when: false - when: stashed.changed - - name: set owner recursive for repo file: path: "{{ dotfiles_repo_path }}"