Update .gitlab-ci.yml

.gitlab-ci.yml

@@ -0,0 +1,17 @@
+pages:
+  image:
+    name: pandoc/alpine
+    entrypoint: ["/bin/sh", "-c"]
+  script:
+    - mkdir -p public
+    - echo '<meta name="google-site-verification" content="ooqaohCgAywtsa97hQcmfXVsc5ZlgQaKSnXvTkSSLGE" />' > header.html
+    - pandoc -f markdown -t html -s README.md -o public/index.html --metadata title="NOIBW - Nix-Openwrt-ImageBuilder-Wrapper" --metadata keywords=nix,shell,openwrt,image,builder -H header.html
+  artifacts:
+    paths:
+      - public
+  rules:
+    - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]$/'
+      when: on_success
+      allow_failure: false
+    - when: manual
+      allow_failure: true

buildOpenwrt.nix

@@ -6,8 +6,7 @@
     version,
     packages ? [],
     manifestPkgs ? "$(cat manifest_packages)",
-    workingFolder ? "$PWD/_builder",
+    workingFolder ? "$PWD/_builder"
-    builderVersion ? version
 }:
 pkgs.mkShell {
     name = "openwrt-build-${target}-${arch}-${profile}";
@@ -42,18 +41,17 @@ pkgs.mkShell {
     shellHook =
     ''
         export WORKING_FOLDER=$(realpath ${workingFolder})
-        mkdir -p $WORKING_FOLDER
         function loadBuilder() {
-            curl -s https://downloads.openwrt.org/releases/${builderVersion}/targets/${target}/${arch}/openwrt-imagebuilder-${builderVersion}-${target}-${arch}.Linux-x86_64.tar.xz | tar xvJ -C $WORKING_FOLDER
+            curl -s https://downloads.openwrt.org/releases/${version}/targets/${target}/${arch}/openwrt-imagebuilder-${version}-${target}-${arch}.Linux-x86_64.tar.xz | tar xvJ -C $WORKING_FOLDER
-            curl -s https://downloads.openwrt.org/releases/${version}/targets/${target}/${arch}/openwrt-${version}-${target}-${arch}.manifest | cut -f 1 -d ' ' | tr '\n' ' ' > $WORKING_FOLDER/openwrt-imagebuilder-${builderVersion}-${target}-${arch}.Linux-x86_64/manifest_packages
+            curl -s https://downloads.openwrt.org/releases/${version}/targets/${target}/${arch}/openwrt-${version}-${target}-${arch}.manifest | cut -f 1 -d ' ' | tr '\n' ' ' > $WORKING_FOLDER/openwrt-imagebuilder-${version}-${target}-${arch}.Linux-x86_64/manifest_packages
         }
 
         function removeBuilder() {
-            rm -rf $WORKING_FOLDER/openwrt-imagebuilder-${builderVersion}-${target}-${arch}.Linux-x86_64
+            rm -rf $WORKING_FOLDER/openwrt-imagebuilder-${version}-${target}-${arch}.Linux-x86_64
         }
 
         function makeImage() {
-            cd $WORKING_FOLDER/openwrt-imagebuilder-${builderVersion}-${target}-${arch}.Linux-x86_64
+            cd $WORKING_FOLDER/openwrt-imagebuilder-${version}-${target}-${arch}.Linux-x86_64
             MANIFEST_PKGS=${manifestPkgs}
             make image PROFILE=${profile} PACKAGES="$MANIFEST_PKGS ${toString packages}"
         }

devices/gli-repeater-img.nix

@@ -2,13 +2,11 @@
 pkgs.callPackage ../buildOpenwrt.nix {
         target = "ar71xx";
         arch = "generic";
-        version= "19.07.7";
+        version= "19.07.4";
         profile = "gl-inet-6416A-v1";
         packages = [
             "luci-ssl"
             "luci-proto-wireguard"
             "luci-app-wireguard"
-            "kmod-ath9k-htc"
-            "ath9k-htc-firmware"
         ];
 }

devices/my-router-img.nix

@@ -2,8 +2,7 @@
 pkgs.callPackage ../buildOpenwrt.nix {
         target = "mvebu";
         arch = "cortexa9";
-        version= "19.07.7";
+        version= "19.07.4";
-        builderVersion = "19.07-SNAPSHOT";
         profile = "linksys_wrt1200ac";
         packages = [
             "adblock"

devices/pi-img.nix

@@ -2,7 +2,7 @@
 pkgs.callPackage ../buildOpenwrt.nix {
         target = "brcm2708";
         arch = "bcm2708";
-        version= "19.07.7";
+        version= "19.07.4";
         profile = "rpi";
         packages = ["luci-ssl"];
 }