diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dccc6a..9f813ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,25 @@ +## 0.3.0 (2024-10-06) + +### Feat + +- **jenkins**: change the output path + +## 0.2.0 (2024-10-06) + +### Feat + +- **pkg**: adjust packages and configs + +### Refactor + +- **adjustment**: adjust some build params + +## 0.1.1 (2024-10-05) + +### Refactor + +- **jenkinsfile**: fix syntax + ## 0.1.0 (2024-10-05) ### Feat diff --git a/Jenkinsfile b/Jenkinsfile index 78f0949..5aa0520 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,12 +16,14 @@ pipeline { } steps { - script ''' - #!/bin/bash + script { + sh ''' + #!/bin/bash - git clean -xfd - git reset --hard - ''' + git clean -xfd + git reset --hard + ''' + } } } @@ -31,11 +33,23 @@ pipeline { } steps { - script ''' - #!/bin/bash + script { + sh ''' + #!/bin/bash - mkarchiso -v -w work -o out server - ''' + echo -ne "I am user " + whoami + + mkarchiso -v -w work -o out server + + ''' + } + } + + post { + always { + archiveArtifacts artifacts: "out/*.iso" + } } } } diff --git a/cz.json b/cz.json index 85637c0..563b918 100644 --- a/cz.json +++ b/cz.json @@ -3,7 +3,7 @@ "name": "cz_conventional_commits", "tag_format": "$version", "version_scheme": "semver2", - "version": "0.1.0", + "version": "0.3.0", "update_changelog_on_bump": true, "major_version_zero": true } diff --git a/server/airootfs/etc/hostname b/server/airootfs/etc/hostname index 2dbe21e..7d83a4f 100644 --- a/server/airootfs/etc/hostname +++ b/server/airootfs/etc/hostname @@ -1 +1 @@ -archiso +ariaos diff --git a/server/airootfs/etc/motd b/server/airootfs/etc/motd index 4d9eda1..6e58095 100644 --- a/server/airootfs/etc/motd +++ b/server/airootfs/etc/motd @@ -1,11 +1 @@ -To install Arch Linux follow the installation guide: -https://wiki.archlinux.org/title/Installation_guide - -For Wi-Fi, authenticate to the wireless network using the iwctl utility. -For mobile broadband (WWAN) modems, connect with the mmcli utility. -Ethernet, WLAN and WWAN interfaces using DHCP should work automatically. - -After connecting to the internet, the installation guide can be accessed -via the convenience script Installation_guide. - -                                           +Welcome to AriaOS Server Installation \ No newline at end of file diff --git a/server/grub/loopback.cfg b/server/grub/loopback.cfg index 3a5d244..b46fecf 100644 --- a/server/grub/loopback.cfg +++ b/server/grub/loopback.cfg @@ -21,7 +21,7 @@ else fi # Set default menu entry -default=archlinux +default=ariaos timeout=15 timeout_style=menu diff --git a/server/packages.x86_64 b/server/packages.x86_64 index 724adbf..e2195e6 100644 --- a/server/packages.x86_64 +++ b/server/packages.x86_64 @@ -4,6 +4,7 @@ arch-install-scripts archinstall b43-fwcutter base +base-devel bcachefs-tools bind bolt diff --git a/server/profiledef.sh b/server/profiledef.sh index 6d47901..436fca3 100644 --- a/server/profiledef.sh +++ b/server/profiledef.sh @@ -2,7 +2,7 @@ # shellcheck disable=SC2034 iso_name="ariaos" -iso_label="AOSServer_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" +iso_label="AriaOSServer_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" iso_publisher="Aria " iso_application="AriaOS Server ISO" iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)" @@ -21,7 +21,4 @@ file_permissions=( ["/root"]="0:0:750" ["/root/.automated_script.sh"]="0:0:755" ["/root/.gnupg"]="0:0:700" - ["/usr/local/bin/choose-mirror"]="0:0:755" - ["/usr/local/bin/Installation_guide"]="0:0:755" - ["/usr/local/bin/livecd-sound"]="0:0:755" ) diff --git a/server/syslinux/archiso_tail.cfg b/server/syslinux/ariaos_tail.cfg similarity index 100% rename from server/syslinux/archiso_tail.cfg rename to server/syslinux/ariaos_tail.cfg