0
0
mirror of https://github.com/cucumber-sp/yandex-music-linux.git synced 2025-01-11 22:41:03 +03:00

Try to fix CI build

Remove ubuntu

fix nix-os container

unzip dependency

artifacts name fix

updating package version

fix

fix branch name
This commit is contained in:
Andrey Onishchenko 2024-02-02 13:27:57 +03:00
parent 2a6702b05e
commit cd5016dc01
2 changed files with 25 additions and 21 deletions

View File

@ -11,20 +11,10 @@ else
fi fi
case $OS in case $OS in
"Ubuntu")
echo Ubuntu
apt-get update
apt-get install -y jq curl p7zip-full nodejs npm unzip jq
npm install -g @electron/asar
sh ./build_deb.sh -a all
mkdir dist
mv deb/*.deb dist
;;
"Arch Linux") "Arch Linux")
echo "Arch Linux" echo "Arch Linux"
pacman -Syy --noconfirm pacman -Syy --noconfirm
pacman -S --noconfirm git sudo base-devel p7zip nodejs jq npm electron libpulse pacman -S --noconfirm git sudo base-devel p7zip nodejs jq npm electron libpulse dpkg unzip
# fix access # fix access
mkdir /.npm mkdir /.npm
chown -R 65534:65534 "/.npm" chown -R 65534:65534 "/.npm"
@ -37,15 +27,21 @@ case $OS in
setfacl -m u::rwx,g::rwx /home/build setfacl -m u::rwx,g::rwx /home/build
setfacl -d --set u::rwx,g::rwx,o::- /home/build setfacl -d --set u::rwx,g::rwx,o::- /home/build
chown nobody . chown nobody .
sh ./generate_packages.sh
sudo -u nobody makepkg --log sudo -u nobody makepkg --log
mkdir dist mkdir dist
mv *.pkg.tar.zst dist mv *.pkg.tar.zst dist
sh ./build_deb.sh -a all
mv deb/*.deb dist
;;
"Ubuntu")
echo NixOS
sh ./generate_packages.sh
export NIXPKGS_ALLOW_UNFREE=1
nix build --impure
;; ;;
# "NixOS")
# echo NixOS
# nix build
# ;;
*) *)
echo "Operating system is not recognized." echo "Operating system is not recognized."
;; ;;

View File

@ -6,7 +6,7 @@ on:
- '*' - '*'
push: push:
branches: branches:
- 'main' - 'master'
jobs: jobs:
@ -14,7 +14,6 @@ jobs:
strategy: strategy:
matrix: matrix:
container: container:
- ubuntu:22.04
- archlinux:latest - archlinux:latest
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
@ -26,10 +25,18 @@ jobs:
- name: Build - name: Build
run: sh ./.github/workflows/build.sh run: sh ./.github/workflows/build.sh
- name: Upload artifact - name: Upload Arch artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
path: ./dist/* path: ./dist/*.pkg.tar.zst
name: arch-packages
- name: Upload Deb artifact
uses: actions/upload-artifact@v4
with:
path: ./dist/*.deb
name: deb-packages
nix-build: nix-build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
@ -42,9 +49,10 @@ jobs:
uses: cachix/install-nix-action@v22 uses: cachix/install-nix-action@v22
- name: Build - name: Build
run: nix build run: sh ./.github/workflows/build.sh
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
path: ./result/* path: ./result/*
name: nix-package