Skip to content

Commit 18e37b8

Browse files
authored
Merge branch 'archlinux:master' into master
2 parents f544cfc + b96afcc commit 18e37b8

131 files changed

Lines changed: 5516 additions & 2802 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/01_bug.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ body:
4141
attributes:
4242
value: >
4343
**Note**: Assuming you have network connectivity,
44-
you can easily post the installation log using the following command:
45-
`curl -F'file=@/var/log/archinstall/install.log' https://0x0.st`
44+
you can easily upload the installation log and get a shareable URL by running:
45+
`archinstall share-log`
4646
4747
- type: textarea
4848
id: freeform

.github/workflows/iso-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- run: cat /etc/os-release
3333
- run: pacman-key --init
3434
- run: pacman --noconfirm -Sy archlinux-keyring
35-
- run: ./build_iso.sh
35+
- run: ./test_tooling/mkarchiso/build_iso.sh
3636
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
3737
with:
3838
name: Arch Live ISO
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Translation validation
2+
on:
3+
push:
4+
paths:
5+
- 'archinstall/**/*.py'
6+
- 'archinstall/locales/**'
7+
- '.github/workflows/translation-check.yaml'
8+
pull_request:
9+
paths:
10+
- 'archinstall/**/*.py'
11+
- 'archinstall/locales/**'
12+
- '.github/workflows/translation-check.yaml'
13+
jobs:
14+
translations:
15+
name: Validate translations
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
19+
- name: Install gettext
20+
run: sudo apt-get update && sudo apt-get install -y gettext
21+
- name: Run translation checks
22+
run: bash archinstall/locales/locales_generator.sh check

.github/workflows/uki-build.yaml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# This workflow will build an Arch Linux UKI file with the commit on it
2+
3+
name: Build Arch UKI with ArchInstall Commit
4+
5+
on:
6+
push:
7+
branches:
8+
- master
9+
- main # In case we adopt this convention in the future
10+
pull_request:
11+
paths-ignore:
12+
- 'docs/**'
13+
- '**.editorconfig'
14+
- '**.gitignore'
15+
- '**.md'
16+
- 'LICENSE'
17+
- 'PKGBUILD'
18+
release:
19+
types:
20+
- created
21+
22+
jobs:
23+
build:
24+
runs-on: ubuntu-latest
25+
container:
26+
image: archlinux/archlinux:latest
27+
options: --privileged
28+
steps:
29+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
30+
- run: pwd
31+
- run: find .
32+
- run: cat /etc/os-release
33+
- run: pacman-key --init
34+
- run: pacman --noconfirm -Sy archlinux-keyring
35+
- run: pacman --noconfirm -Sy mkosi
36+
- run: (cd test_tooling/mkosi/ && mkosi build -B)
37+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
38+
with:
39+
name: Arch Live UKI
40+
path: test_tooling/mkosi/mkosi.output/*.efi

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,7 @@ requirements.txt
4141
/cmd_output.txt
4242
node_modules/
4343
uv.lock
44+
test_tooling/mkosi/mkosi.output/*image*
45+
test_tooling/mkosi/mkosi.cache/**
46+
test_tooling/mkosi/mkosi.tools/**
47+
test_tooling/mkosi/mkosi.tools.manifest

.pre-commit-config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
default_stages: ['pre-commit']
22
repos:
33
- repo: https://github.com/astral-sh/ruff-pre-commit
4-
rev: v0.15.12
4+
rev: v0.15.14
55
hooks:
66
# fix unused imports and sort them
77
- id: ruff
@@ -31,7 +31,7 @@ repos:
3131
args: [--config=.flake8]
3232
fail_fast: true
3333
- repo: https://github.com/pre-commit/mirrors-mypy
34-
rev: v1.20.2
34+
rev: v2.1.0
3535
hooks:
3636
- id: mypy
3737
args: [
@@ -41,6 +41,7 @@ repos:
4141
additional_dependencies:
4242
- pydantic
4343
- pytest
44+
- hypothesis
4445
- cryptography
4546
- textual
4647
- repo: local

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ If you come across any issues, kindly submit your issue here on GitHub or post y
101101
When submitting an issue, please:
102102
* Provide the stacktrace of the output if applicable
103103
* Attach the `/var/log/archinstall/install.log` to the issue ticket. This helps us help you!
104-
* To extract the log from the ISO image, one way is to use<br>
104+
* To upload the log from the ISO image and get a shareable URL, run<br>
105105
```shell
106-
curl -F'file=@/var/log/archinstall/install.log' https://0x0.st
106+
archinstall share-log
107107
```
108108

109109

archinstall/applications/audio.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from typing import TYPE_CHECKING
22

33
from archinstall.lib.hardware import SysInfo
4+
from archinstall.lib.log import debug
45
from archinstall.lib.models.application import Audio, AudioConfiguration
56
from archinstall.lib.models.users import User
6-
from archinstall.lib.output import debug
77

88
if TYPE_CHECKING:
99
from archinstall.lib.installer import Installer

archinstall/applications/bluetooth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import TYPE_CHECKING
22

3-
from archinstall.lib.output import debug
3+
from archinstall.lib.log import debug
44

55
if TYPE_CHECKING:
66
from archinstall.lib.installer import Installer

archinstall/applications/firewall.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from typing import TYPE_CHECKING
22

3+
from archinstall.lib.log import debug
34
from archinstall.lib.models.application import Firewall, FirewallConfiguration
4-
from archinstall.lib.output import debug
55

66
if TYPE_CHECKING:
77
from archinstall.lib.installer import Installer

0 commit comments

Comments
 (0)