Merge pull request #126 from wslutilities/dev/master

[Release] wslu 4.0.0
wslutilities · Aug 27, 2022 · 86a6b78 · 86a6b78
2 parents 01bda18 + ecb3c14
commit 86a6b78
Show file tree

Hide file tree

Showing 64 changed files with 1,566 additions and 558 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,4 +1,3 @@
-# These are supported funding model platforms
-
-github: patrick330602
+github: [wslutilities, patrick330602]
 open_collective: wslutilities
+liberapay: callmepk
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,9 +4,21 @@ about: Create a report to help us improve
 
 ---
 
+<!--- ATTENTION!
+ Built-in versions of wslu in Ubuntu are no longer supported by me. 
+ If you have problems, please:
+
+ 1. Report to the Ubuntu WSL team; or
+ 2. Try the PPA version of WSL here: 
+     <https://launchpad.net/~wslutilities/+archive/ubuntu/wslu>
+
+ Usually The PPA version of wslu will address most of your problems.
+--->
+
 **Background Information:**
- - Build: [e.g. 17704]
- - WSL: [e.g. Ubuntu 16.04]
+ - Windows Version: [Windows 10 or 11]
+ - Windows Build: [e.g. build 17704]
+ - WSL: [e.g. Ubuntu 20.04]
  - Version: [e.g. 1.5]
 
 **Describe the bug**

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -3,4 +3,4 @@ blank_issues_enabled: true
 contact_links:
   - name: "Ubuntu bugs"
     url: https://bugs.launchpad.net/ubuntu/+source/wslu
-    about: For Ubuntu version, you should not only report bug here but also report bug at Launchpad.
+    about: For Ubuntu version, you should only report bug at Launchpad.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,9 +5,11 @@
 
 ## Types of changes
 <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+
+> Breaking change (fix or feature that would cause existing functionality to not work as expected) are no longer accepted
+
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
 
 ## Checklist:
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->

diff --git a/.github/actions/rpmbuild/action.yml b/.github/actions/rpmbuild/action.yml
@@ -3,9 +3,8 @@ description: Build an RPM.
 
 runs:
   using: docker
-  #image: 'docker://robertdebock/github-action-rpmbuild:centos-7'
-  image: 'Dockerfile'
+  image: "Dockerfile"
 
 branding:
   icon: box
-  color: green
+  color: green
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -0,0 +1,27 @@
+name: Documentation Website Deployment
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'CODE_OF_CONDUCT.md'
+      - 'CONTRIBUTING.md'
+jobs:
+  build:
+    name: Documentation Deployment
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: deploy manpages to website
+        env:
+          GH_TOKEN: ${{ secrets.GIT_DEPLOY_KEY }}
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "Jinming Wu, Patrick"
+          git clone --depth 1 https://patrick330602:[email protected]/wslutilities/wslutilities.github.io.git website
+          cp -f ./CODE_OF_CONDUCT.md ./website/coc.md
+          cp -f ./CONTRIBUTING.md ./website/contributing.md
+          git --git-dir=./website/.git --work-tree=./website add -A
+          git --git-dir=./website/.git --work-tree=./website commit -m "Manpage update"
+          git --git-dir=./website/.git --work-tree=./website push
+
diff --git a/.github/workflows/manpage.yml b/.github/workflows/manpage.yml
@@ -7,8 +7,8 @@ on:
       - 'docs/*'
 jobs:
   build:
-    name: Manpage Generate
-    runs-on: ubuntu-18.04
+    name: Manpage Generate and Deployment
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install Pre-requisites

diff --git a/.github/workflows/pkgbuild.yml b/.github/workflows/pkgbuild.yml
@@ -1,72 +1,57 @@
-name: Packaging Builds
+name: CI/CD Dev Build Deployment
 on:
   push:
     branches:
-      - develop
       - dev/**
       - lts/**
+
 jobs:
-  deb10build:
-    name: Debian 10
-    runs-on: ubuntu-18.04
+  debbuild:
+    name: Debian
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install Pre-requisites
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -qq apt-utils build-essential gzip devscripts debhelper
+          sudo apt-get install -qq apt-utils build-essential gzip devscripts debhelper bats
       - name: Build Debian Package
         run: |
-          bash ./configure.sh --deb buster
-          debuild -i -us -uc -b
+          git clone https://github.com/wslutilities/wslu-debian builder
+          cd builder/
+          bash ./build.sh --ci dev debian unstable
+          cd ../
           mkdir -p ./pkgs
           mv ../wsl*.* ./pkgs
       - uses: actions/upload-artifact@v1
         with:
-          name: Debian10DEBs
-          path: pkgs
-  deb11build:
-    name: Debian 11
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install Pre-requisites
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -qq apt-utils build-essential gzip devscripts debhelper
-      - name: Build Debian Package
-        run: |
-          bash ./configure.sh --deb bullseye
-          debuild -i -us -uc -b
-          mkdir -p ./pkgs
-          mv ../wsl*.* ./pkgs
-      - uses: actions/upload-artifact@v1
-        with:
-          name: Debian1DEBs
+          name: DebianDEBs
           path: pkgs
   pgwbuild:
     name: Pengwin
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install Pre-requisites
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -qq apt-utils build-essential gzip devscripts debhelper
+          sudo apt-get install -qq apt-utils build-essential gzip devscripts debhelper bats
       - name: Build Debian Package
         run: |
-          bash ./configure.sh --deb bullseye
-          debuild -i -us -uc -b
+          git clone https://github.com/wslutilities/wslu-debian builder
+          cd builder/
+          bash ./build.sh --ci dev pengwin
+          cd ../
           mkdir -p ./pkgs
           mv ../wsl*.* ./pkgs
       - uses: actions/upload-artifact@v1
         with:
           name: PengwinDEBs
           path: pkgs
   pgwspdeploy:
-    name: Pengwin Dev version Deploying
+    name: Pengwin Deploying
     needs: pgwbuild
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     container: circleci/ruby:2.3-jessie
     steps:
       - name: Retrive package for deployment
@@ -77,10 +62,65 @@ jobs:
       - name: deploy to the dev
         env:
           PACKAGECLOUD_TOKEN: ${{ secrets.PGW_DEV_DEPLOY_KEY }}
-        run: package_cloud push whitewaterfoundry/wslu-dev/debian/bullseye ./PengwinDEBs/*.deb --skip-errors
-  rpmbuild:
-    name: RPM
-    runs-on: ubuntu-18.04
+        run: package_cloud push whitewaterfoundry/wslu/debian/bullseye ./PengwinDEBs/*.deb --skip-errors
+  rpmobsbuild:
+    name: RPM - OpenSUSE Build Service
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Pre-requisites
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq build-essential tar
+      - name: configure
+        run: |
+          bash ./configure.sh --rpm obs_canary
+          cp extras/build/rpm/obs/wslu.spec ../wslu-canary.spec
+          rm -rf *
+          mkdir -p SOURCES
+          mkdir -p SPECS
+          cp ../wslu-*.tar.gz SOURCES
+          cp ../wslu-canary.spec SPECS
+      - name: rpmbuild
+        uses: ./.github/actions/rpmbuild/
+      - name: moving files
+        run: |
+          mkdir obs_res
+          cp ../wslu-*.tar.gz obs_res
+          cp ../wslu-canary.spec obs_res
+      - uses: actions/upload-artifact@v1
+        with:
+          name: OBS_RES
+          path: obs_res
+  obsdeploy:
+    name: OpenSUSE Build Service Deploying
+    needs: rpmobsbuild
+    runs-on: ubuntu-latest
+    steps:
+        - name: Retrive package for deployment
+          uses: actions/download-artifact@v1
+          with:
+            name: OBS_RES
+        - name: Install Pre-requisites
+          run: |
+            sudo apt-get update -qq
+            sudo apt-get install -qq osc python3-m2crypto
+        - name: Install API token for osc
+          env:
+            API_TOKEN_CONTENT: ${{ secrets.OBS_API_TOKEN }}
+          run: |
+            mkdir -p "$HOME/.config/osc"
+            echo -e "[general]\napiurl = https://api.opensuse.org\n[https://api.opensuse.org]\nuser = wslutilities\npass = $API_TOKEN_CONTENT" > "$HOME/.config/osc/oscrc"
+        - name: Uploading OBS source files
+          run: |
+            osc checkout home:wslutilities
+            cp OBS_RES/* home:wslutilities/wslu-canary/
+            cd home:wslutilities/wslu-canary/
+            osc addremove
+            osc commit -m "Build at $(date)"
+  rpmcoprbuild:
+    name: RPM - Cool Other Package Repo
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install Pre-requisites
@@ -89,8 +129,8 @@ jobs:
           sudo apt-get install -qq build-essential tar
       - name: configure
         run: |
-          bash ./configure.sh --rpm
-          cp extras/build/rpm/wslu.spec ../wslu.spec
+          bash ./configure.sh --rpm copr
+          cp extras/build/rpm/copr/wslu.spec ../wslu.spec
           rm -rf *
           mkdir -p SOURCES
           mkdir -p SPECS
@@ -106,15 +146,27 @@ jobs:
         #uses: robertdebock/[email protected]
       - uses: actions/upload-artifact@v1
         with:
-          name: RPMs
+          name: COPRRPMs
           path: compiled_rpms
-      # - name: deploy RPM source to rpm-wslu
-      #   env:
-      #     GH_TOKEN: ${{ secrets.GIT_DEPLOY_KEY }}
-      #   run: |
-      #     git config --global user.email "[email protected]"
-      #     git config --global user.name "Jinming Wu, Patrick"
-      #     git clone --depth 1 https://patrick330602:[email protected]/wslutilities/rpm-wslu.git rpm-repo
-      #     git --git-dir=./rpm-repo/.git --work-tree=./rpm-repo add -A
-      #     git --git-dir=./rpm-repo/.git --work-tree=./rpm-repo commit -m "RPM Packaging file update: $(date)"
-      #     git --git-dir=./rpm-repo/.git --work-tree=./rpm-repo push
+  coprdeploy:
+    name: Cool Other Package Repo Deploying
+    needs: rpmcoprbuild
+    container: fedora:latest
+    runs-on: ubuntu-latest
+    steps:
+        - name: Retrive package for deployment
+          uses: actions/download-artifact@v1
+          with:
+            name: COPRRPMs
+        - name: Install API token for copr-cli
+          env:
+            API_TOKEN_CONTENT: ${{ secrets.COPR_API_TOKEN }}
+          run: |
+            mkdir -p "$HOME/.config"
+            echo "$API_TOKEN_CONTENT" > "$HOME/.config/copr"
+        - name: Install tooling for source RPM build
+          run: |
+            dnf -y install @development-tools @rpm-development-tools
+            dnf -y install copr-cli make
+        - name: Submit the build by uploading the source RPM
+          run: copr-cli build wslutilities/wslu-canary COPRRPMs/*.src.rpm