Skip to content

Commit efe8ece

Browse files
committed
Fix
Signed-off-by: chez-shanpu <tomoki.sugiura@mail.shanpu.info>
1 parent 5acd4de commit efe8ece

File tree

27 files changed

+156
-193
lines changed

27 files changed

+156
-193
lines changed

.github/workflows/ansible-scheduled.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
ANSIBLE_FORCE_COLOR: 1
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616
- name: Run make
1717
run: make
1818
- name: Idempotence Test
@@ -23,7 +23,7 @@ jobs:
2323
|| (echo 'Idempotence test: fail' && exit 1)
2424
- name: Archive Idempotence Test output
2525
if: always()
26-
uses: actions/upload-artifact@v2
26+
uses: actions/upload-artifact@v4
2727
with:
2828
name: idempotence-out
2929
path: idempotence-out.txt

.github/workflows/ansible.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
ANSIBLE_FORCE_COLOR: 1
1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2020
- name: Run make
2121
run: make
2222
- name: Idempotence Test
@@ -27,7 +27,7 @@ jobs:
2727
|| (echo 'Idempotence test: fail' && exit 1)
2828
- name: Archive Idempotence Test output
2929
if: always()
30-
uses: actions/upload-artifact@v2
30+
uses: actions/upload-artifact@v4
3131
with:
3232
name: idempotence-out
3333
path: idempotence-out.txt

Makefile

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,41 @@ ANSIBLE_LINT_EXCLUDE="-x indentation,unnamed-task,yaml[indentation]"
77

88
brew-Linux:
99
ifeq (, $(shell which brew))
10-
curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh | /bin/bash
11-
test -d ~/.linuxbrew && eval $(~/.linuxbrew/bin/brew shellenv)
12-
test -d /home/linuxbrew/.linuxbrew && eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)
13-
test -r ~/.bash_profile && echo "eval \$($(brew --prefix)/bin/brew shellenv)" >>~/.bash_profile
14-
echo "eval \$($(brew --prefix)/bin/brew shellenv)" >>~/.profile
10+
sudo apt-get update
11+
sudo apt-get install -y \
12+
build-essential \
13+
procps \
14+
curl \
15+
file \
16+
git
17+
/bin/bash -c "$$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
18+
test -d ~/.linuxbrew && eval "$$(~/.linuxbrew/bin/brew shellenv)"
19+
test -d /home/linuxbrew/.linuxbrew && eval "$$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
20+
echo 'eval "$$($(brew --prefix)/bin/brew shellenv)"' >> ~/.bashrc
1521
else
1622
@echo "linuxbrew is already exits."
1723
endif
1824

1925
brew-Darwin:
2026
ifeq (, $(shell which brew))
21-
curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh | /bin/bash
27+
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
28+
2229
else
2330
@echo "homebrew is already exits."
2431
endif
2532

2633
.PHONY: brew
2734
brew: brew-$(UNAME)
35+
brew install hello
2836

2937
.PHONY: age
3038
age:
3139
brew install age
3240

3341
python-Linux:
34-
sudo apt update
35-
sudo apt install -y python3
36-
sudo apt upgrade -y python3
42+
sudo apt-get update
43+
sudo apt-get install -y python3
44+
sudo apt-get upgrade -y python3
3745

3846
python-Darwin:
3947
brew install python
@@ -42,11 +50,11 @@ python-Darwin:
4250
python: python-$(UNAME)
4351

4452
ansible-Linux:
45-
sudo apt update
46-
sudo apt install software-properties-common
47-
sudo add-apt-repository --yes --update ppa:ansible/ansible
48-
sudo apt install -y ansible
49-
sudo apt install -y ansible-lint
53+
sudo apt-get update
54+
sudo apt-get install -y software-properties-common
55+
sudo add-get-apt-repository --yes --update ppa:ansible/ansible
56+
sudo apt-get install -y ansible
57+
sudo apt-get install -y ansible-lint
5058

5159
ansible-Darwin:
5260
brew install ansible

dev-provisioning.yaml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
- hosts: localhost
33
strategy: linear
44
roles:
5-
- name: common
6-
tags: common
5+
- name: tools
6+
tags: tools
77

88
- name: mac
99
tags: mac
@@ -15,9 +15,6 @@
1515
- name: fish
1616
tags: fish
1717

18-
- name: anyenv
19-
tags: anyenv
20-
2118
- name: c
2219
tags: c
2320

@@ -30,18 +27,12 @@
3027
- name: go
3128
tags: go
3229

33-
- name: hyper-terminal
34-
tags: hyper-terminal
35-
3630
- name: kubernetes
3731
tags: kubernetes
3832

3933
- name: neovim
4034
tags: neovim
4135

42-
- name: python
43-
tags: python
44-
4536
- name: tex
4637
tags: tex
4738

group_vars/all.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
github_user: chez-shanpu
22
ghq_root: '{{ lookup("env","HOME") }}/ghq'
3-
repos_root: '{{ ghq_root }}/github.com/{{ github_user }}'
4-
dotfiles_path: '{{ repos_root }}/dotfiles'
3+
repos_root: '{{ ghq_root }}/github.com/{{ github_user }}'

roles/anyenv/tasks/main.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

roles/c/tasks/main.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
---
2-
- include_tasks: debian.yaml
2+
- name: Setup C in Debian
3+
ansible.builtin.include_tasks: debian.yaml
34
when: ansible_os_family == "Debian"

roles/common/tasks/debian.yaml

Lines changed: 0 additions & 51 deletions
This file was deleted.

roles/common/tasks/main.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

roles/docker/tasks/main.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
2-
- include_tasks: darwin.yaml
2+
- name: Setup docker in Darwin
3+
ansible.builtin.include_tasks: darwin.yaml
34
when: ansible_os_family == "Darwin"
45

5-
- include_tasks: ubuntu.yaml
6+
- name: Setup docker in Ubuntu
7+
ansible.builtin.include_tasks: ubuntu.yaml
68
when: ansible_distribution == "Ubuntu"

0 commit comments

Comments
 (0)