Bladeren bron

Merge pull request #2 from xmake-io/dev

Hoildkv 4 jaren geleden
bovenliggende
commit
5b88136e5d
2 gewijzigde bestanden met toevoegingen van 50 en 1 verwijderingen
  1. 49 0
      .github/workflows/deploy.yml
  2. 1 1
      scripts/packages.lua

+ 49 - 0
.github/workflows/deploy.yml

@@ -0,0 +1,49 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v1
+      - uses: xmake-io/github-action-setup-xmake@v1
+        with:
+          xmake-version: branch@dev
+
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_KEY }}
+          name: id_rsa # optional
+          known_hosts: ${{ secrets.KNOWN_HOSTS }}
+
+      - name: Installation
+        run: |
+          sudo apt-get install -y nodejs npm
+          sudo npm install markdown-to-html -g
+
+      - name: Publish
+        run: |
+          git clone [email protected]:xmake-io/xrepo-docs.git
+          cd xrepo-docs
+          git remote add all [email protected]:xmake-io/xrepo-docs.git
+          git remote set-url --add all [email protected]:waruqi/xrepo-docs.git
+          git remote set-url --add all [email protected]:xmake-io/xrepo-docs.git
+          git remote set-url --add all [email protected]:xmake-io/xrepo-docs.git
+          xmake l -vD `pwd`/build.lua
+          git config --global user.email "[email protected]"
+          git config --global user.name "ruki"
+          git add -A
+          git diff-index --quiet HEAD || git commit -m "autoupdate docs by xmake-repo/ci"
+          git push all master
+
+

+ 1 - 1
scripts/packages.lua

@@ -71,7 +71,7 @@ function main(opt)
                     end
                     end
                     if #package_archs > 0 then
                     if #package_archs > 0 then
                         packages[plat] = packages[plat] or {}
                         packages[plat] = packages[plat] or {}
-                        table.insert(packages[plat], {name = instance:name(), archs = package_archs, generic = #package_archs == #archs})
+                        table.insert(packages[plat], {name = instance:name(), instance = instance, archs = package_archs, generic = #package_archs == #archs})
                     end
                     end
                 end
                 end
             end
             end