Merge pull request #324 from Difegue/dev

Workflow fixes
Difegue · Jul 26, 2020 · 7560d68 · 7560d68
2 parents fc1808f + 2b0e94c
commit 7560d68
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/.github/workflows/push-brewtest.yml b/.github/workflows/push-brewtest.yml
@@ -0,0 +1,18 @@
+on: push
+name: "Test Homebrew"
+jobs:
+  testBrew:
+    name: Test Homebrew version
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Build and test bundled homebrew formula
+      run: |
+        brew update
+        cd tools/build/homebrew
+        echo "Replacing commit hash in formula with current hash $(git rev-parse --verify HEAD)"
+        sed -i.bck "s/COMMIT_HASH/$(git rev-parse --verify HEAD)/" Lanraragi.rb
+        brew unlink node@12
+        brew install --force --verbose --build-from-source Lanraragi.rb
+        brew test --verbose Lanraragi.rb 
+        brew audit --verbose Lanraragi.rb
diff --git a/.github/workflows/push-continuous-integration.yml b/.github/workflows/push-continuous-integration.yml
@@ -16,19 +16,4 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-          args: ./lib/* ./script/* ./tools/install.pl
-  testBrew:
-    name: Test Homebrew version
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@master
-    - name: Build and test bundled homebrew formula
-      run: |
-        brew update
-        cd tools/build/homebrew
-        echo "Replacing commit hash in formula with current hash $(git rev-parse --verify HEAD)"
-        sed -i.bck "s/COMMIT_HASH/$(git rev-parse --verify HEAD)/" Lanraragi.rb
-        brew unlink node@12
-        brew install --force --verbose --build-from-source Lanraragi.rb
-        brew test --verbose Lanraragi.rb 
-        brew audit --verbose Lanraragi.rb
+          args: ./lib/* ./script/* ./tools/install.pl
diff --git a/tools/build/homebrew/Lanraragi.rb b/tools/build/homebrew/Lanraragi.rb
@@ -5,10 +5,10 @@ class Lanraragi < Formula
   homepage "https://github.com/Difegue/LANraragi"
   # url "https://github.com/Difegue/LANraragi/archive/v.0.7.1.tar.gz"
   # sha256 "bfef465abb30f2ff18cda2fea6712f5ff35b3d23b0d6f2e7ea4cfe1c46e69585"
-  license "MIT"
   url "https://github.com/Difegue/LANraragi.git",
       :revision => "COMMIT_HASH"
   version "0.1994-dev"
+  license "MIT"
   head "https://github.com/Difegue/LANraragi.git"
 
   depends_on "pkg-config" => :build