0f323b5 · warden · git.iko.soy

git.iko.soy/warden

Added focal support (#45)

* Added focal support * Fixed warning * hard code docker image * print docker version * downgraded ubuntu * Downgraded clickable

commit0f323b550d61d98c03619500010fdf6fbd0e92da authoriko <ilyakooo0@gmail.com> dateSun 5 Feb 2023, 17:44 (4 years ago) parent6178834

3 files changed+7−4

compare with master

unifiedsplit

.github/workflows/build.yaml+3−2 clickable.yaml+3−1 warden.apparmor+1−1

.github/workflows/build.yaml+3−2

@@ -8,7 +8,7 @@ on:

99jobs:

1010 build:

11− runs-on: ubuntu-latest

11+ runs-on: ubuntu-20.04

1212

1313 steps:

1414 - uses: cachix/install-nix-action@v18

@@ -19,8 +19,9 @@ jobs:

1919

2020 - name: Install clickable

2121 run: |

22+ docker --version

2223 sudo apt install adb git python3 python3-pip python3-setuptools

23− pip3 install --user clickable-ut --upgrade

24+ pip3 install --user clickable-ut==7.10.0 --upgrade

2425 echo 'export PATH="$PATH:$HOME/.local/bin"' >> ~/.bashrc

2526

2627 - name: Build bw libraries

clickable.yaml+3−1

@@ -1,7 +1,9 @@

11clickable_minimum_required: 7.1.2

2+framework: ubuntu-sdk-20.04

23builder: custom

34build: $SRC_DIR/build.sh

45kill: webapp-container*

6+docker_image: clickable/amd64-20.04-amd64

57image_setup:

68 env:

79 NIX_PATH: nixpkgs=https://github.com/NixOS/nixpkgs/archive/4d2b37a84fad1091b9de401eb450aae66f1a741e.tar.gz

@@ -11,7 +13,7 @@ image_setup:

1113 - mkdir -m 0755 /nix && chown phablet /nix

1214 - curl -L https://nixos.org/nix/install >/tmp/install-nix.sh

1315 - su -l -m phablet -s /bin/bash -c "mkdir -p /home/phablet/.config/nix; echo \"sandbox = false\" >/home/phablet/.config/nix/nix.conf"

14− - su -l -m phablet -s /bin/bash -c "sh /tmp/install-nix.sh --no-daemon --yes --no-channel-add --no-modify-profile"

16+ - su -l -m phablet -s /bin/bash -c "sh /tmp/install-nix.sh --no-daemon --yes --no-modify-profile"

1517 - echo "export PATH=/home/phablet/.nix-profile/bin:\$PATH" >>/home/phablet/.profile

1618 - su -l -m phablet -s /bin/bash -c "nix-env -f \"<nixpkgs>\" -iA purescript elmPackages.elm nodePackages.terser esbuild spago"

1719

warden.apparmor+1−1

@@ -5,5 +5,5 @@

55 "audio",

66 "networking"

77 ],

8− "policy_version": 16.04

8+ "policy_version": 20.04

99}