Skip to content

Commit 73faa04

Browse files
committed
feat: update deps
1 parent 8fd1a56 commit 73faa04

File tree

5 files changed

+30
-36
lines changed

5 files changed

+30
-36
lines changed

.github/workflows/docker.yaml

+19-24
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,33 @@ name: docker
44
on:
55
push:
66
branches:
7-
- 'master'
7+
- "master"
88
paths:
9-
- 'config/**'
10-
- 'scripts/**'
11-
- 'Dockerfile'
12-
- '.github/workflows/docker.yaml'
13-
- '!**.md'
14-
- '!.github/mkdocs.yaml'
15-
- '!docs/**'
9+
- "config/**"
10+
- "scripts/**"
11+
- "Dockerfile"
12+
- ".github/workflows/docker.yaml"
13+
- "!**.md"
14+
- "!.github/mkdocs.yaml"
15+
- "!docs/**"
1616

1717
jobs:
1818
docker:
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-latest
2020
steps:
21-
-
22-
name: Checkout
23-
uses: actions/checkout@v2
24-
-
25-
name: Set up QEMU
26-
uses: docker/setup-qemu-action@v1
27-
-
28-
name: Set up Docker Buildx
29-
uses: docker/setup-buildx-action@v1
30-
-
31-
name: Login to DockerHub
32-
uses: docker/login-action@v1
21+
- name: Checkout
22+
uses: actions/checkout@v4
23+
- name: Set up QEMU
24+
uses: docker/setup-qemu-action@v3
25+
- name: Set up Docker Buildx
26+
uses: docker/setup-buildx-action@v3
27+
- name: Login to DockerHub
28+
uses: docker/login-action@v3
3329
with:
3430
username: shmileee
3531
password: ${{ secrets.DOCKERHUB_TOKEN }}
36-
-
37-
name: Build and push
38-
uses: docker/build-push-action@v2
32+
- name: Build and push
33+
uses: docker/build-push-action@v6
3934
with:
4035
context: .
4136
push: true

.github/workflows/macos.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ name: macos
44
on:
55
push:
66
branches:
7-
- 'master'
7+
- "master"
88
paths:
9-
- 'config/**'
10-
- 'scripts/**'
11-
- '.github/workflows/macos.yaml'
12-
- '!**.md'
13-
- '!.github/mkdocs.yaml'
14-
- '!docs/**'
9+
- "config/**"
10+
- "scripts/**"
11+
- ".github/workflows/macos.yaml"
12+
- "!**.md"
13+
- "!.github/mkdocs.yaml"
14+
- "!docs/**"
1515

1616
jobs:
1717
macos:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [macos-11.0]
21+
os: [macos-latest]
2222

2323
steps:
2424
- name: Clean up installed software

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM homebrew/ubuntu20.04:3.4.2
1+
FROM homebrew/ubuntu24.04:latest
22

33
ENV TIMEZONE "Europe/Warsaw"
4-
ENV DEBIAN_FRONTEND=noninteractive
4+
ENV DEBIAN_FRONTEND noninteractive
55

66
# Setup time zones.
77
RUN sudo ln -snf "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime && \

scripts/linux/essentials.apt

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ git
44
gpg
55
locales
66
make
7-
software-properties-common
87
sudo
98

109
# Editor

scripts/linux/install_dependencies.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cwd="$(cd "$(dirname ${BASH_SOURCE[0]})" && pwd)"
88
apt="sudo apt -y"
99
$apt update
1010

11+
$apt install software-properties-common
1112
sudo add-apt-repository --yes --update ppa:ansible/ansible
1213

1314
install_from_package_list() {
@@ -18,4 +19,3 @@ install_from_package_list() {
1819
}
1920

2021
install_from_package_list "${cwd}/essentials.apt"
21-

0 commit comments

Comments
 (0)