pub

rubickCenter · Oct 1, 2023 · 45aac7c · 45aac7c
1 parent 0d52a9b
commit 45aac7c
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 73 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -36,34 +36,34 @@ jobs:
           - host: windows-latest
             build: pnpm build
             target: x86_64-pc-windows-msvc
-          # - host: windows-latest
-          #   build: |
-          #     pnpm build --target i686-pc-windows-msvc
-          #   target: i686-pc-windows-msvc
-          # - host: ubuntu-latest
-          #   target: x86_64-unknown-linux-gnu
-          #   build: |-
-          #     sudo apt-get update &&
-          #     sudo apt-get install libxdo-dev uuid-dev libc-dev pkg-config libglib2.0-dev libgtk-3-dev libgtk2.0-dev libpango1.0-dev libcairo2-dev libfontconfig1-dev -y &&
-          #     set -e &&
-          #     PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target x86_64-unknown-linux-gnu &&
-          #     strip *.node
-          # - host: ubuntu-latest
-          #   target: x86_64-unknown-linux-musl
-          #   build: |-
-          #     sudo apt-get update &&
-          #     sudo apt-get install libxdo-dev uuid-dev libc-dev pkg-config libglib2.0-dev libgtk-3-dev libgtk2.0-dev libpango1.0-dev libcairo2-dev libfontconfig1-dev -y &&
-          #     set -e &&
-          #     PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target x86_64-unknown-linux-musl &&
-          #     strip *.node
+          - host: windows-latest
+            build: |
+              pnpm build --target i686-pc-windows-msvc
+            target: i686-pc-windows-msvc
+          - host: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            build: |-
+              sudo apt-get update &&
+              sudo apt-get install libxdo-dev uuid-dev libc-dev pkg-config libglib2.0-dev libgtk-3-dev libgtk2.0-dev libpango1.0-dev libcairo2-dev libfontconfig1-dev -y &&
+              set -e &&
+              PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target x86_64-unknown-linux-gnu &&
+              strip *.node
+          - host: ubuntu-latest
+            target: x86_64-unknown-linux-musl
+            build: |-
+              sudo apt-get update &&
+              sudo apt-get install libxdo-dev uuid-dev libc-dev pkg-config libglib2.0-dev libgtk-3-dev libgtk2.0-dev libpango1.0-dev libcairo2-dev libfontconfig1-dev -y &&
+              set -e &&
+              PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target x86_64-unknown-linux-musl &&
+              strip *.node
           - host: macos-latest
             target: aarch64-apple-darwin
             build: |
               pnpm build --target aarch64-apple-darwin
               strip -x *.node
-          # - host: windows-latest
-          #   target: aarch64-pc-windows-msvc
-          #   build: pnpm build --target aarch64-pc-windows-msvc
+          - host: windows-latest
+            target: aarch64-pc-windows-msvc
+            build: pnpm build --target aarch64-pc-windows-msvc
     name: ${{ matrix.settings.target }}
     runs-on: ${{ matrix.settings.host }}
     steps:
@@ -109,51 +109,51 @@ jobs:
           name: bindings-${{ matrix.settings.target }}
           path: addon/${{ env.APP_NAME }}.*.node
           if-no-files-found: error
-  # build-arm:
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       settings:
-  #         - target: aarch64-unknown-linux-gnu
-  #           arch: aarch64
-  #         - target: aarch64-unknown-linux-musl
-  #           arch: aarch64
-  #   name: ${{ matrix.settings.target }}
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: jirutka/setup-alpine@v1
-  #       with:
-  #         arch: ${{ matrix.settings.arch }}
-  #     - name: Cache cargo
-  #       uses: actions/cache@v3
-  #       with:
-  #         path: |
-  #           ~/.cargo/registry/index/
-  #           ~/.cargo/registry/cache/
-  #           ~/.cargo/git/db/
-  #           addon/.cargo-cache
-  #           addon/target/
-  #         key: ${{ matrix.settings.target }}-cargo-ubuntu-latest
-  #     - uses: goto-bus-stop/setup-zig@v2
-  #     - name: Build
-  #       shell: alpine.sh --root {0}
-  #       run: |-
-  #         set -e &&
-  #         apk update &&
-  #         apk add curl gcc libuuid xdo xdotool-dev libc-dev pkgconfig glib-dev gtk+3.0-dev pango-dev cairo-dev fontconfig-dev nodejs npm &&
-  #         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh /dev/stdin -y &&
-  #         source $HOME/.cargo/env &&
-  #         rustup target add ${{ matrix.settings.target }} &&
-  #         npm install &&
-  #         PKG_CONFIG_SYSROOT_DIR=/ npm run build --target ${{ matrix.settings.target }} &&
-  #         strip ${{ matrix.settings.target }}/*.node
-  #     - name: Upload artifact
-  #       uses: actions/upload-artifact@v3
-  #       with:
-  #         name: bindings-${{ matrix.settings.target }}
-  #         path: addon/${{ matrix.settings.target }}/${{ env.APP_NAME }}.*.node
-  #         if-no-files-found: error
+  build-arm:
+    strategy:
+      fail-fast: false
+      matrix:
+        settings:
+          - target: aarch64-unknown-linux-gnu
+            arch: aarch64
+          - target: aarch64-unknown-linux-musl
+            arch: aarch64
+    name: ${{ matrix.settings.target }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: jirutka/setup-alpine@v1
+        with:
+          arch: ${{ matrix.settings.arch }}
+      - name: Cache cargo
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            addon/.cargo-cache
+            addon/target/
+          key: ${{ matrix.settings.target }}-cargo-ubuntu-latest
+      - uses: goto-bus-stop/setup-zig@v2
+      - name: Build
+        shell: alpine.sh --root {0}
+        run: |-
+          set -e &&
+          apk update &&
+          apk add curl gcc libuuid xdo xdotool-dev libc-dev pkgconfig glib-dev gtk+3.0-dev pango-dev cairo-dev fontconfig-dev nodejs npm &&
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh /dev/stdin -y &&
+          source $HOME/.cargo/env &&
+          rustup target add ${{ matrix.settings.target }} &&
+          npm install &&
+          PKG_CONFIG_SYSROOT_DIR=/ npm run build --target ${{ matrix.settings.target }} &&
+          strip ${{ matrix.settings.target }}/*.node
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: bindings-${{ matrix.settings.target }}
+          path: addon/${{ matrix.settings.target }}/${{ env.APP_NAME }}.*.node
+          if-no-files-found: error
   universal-macOS:
     name: Build universal macOS binary
     needs:
@@ -191,7 +191,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - universal-macOS
-    #   - build-arm
+      - build-arm
     steps:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
@@ -214,10 +214,12 @@ jobs:
         run: pnpm config set '//registry.npmjs.org/:_authToken' "${NODE_AUTH_TOKEN}"
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-      - name: Build & Publish
+      - name: Publish Addon
         run: |
           # npm config set provenance true
           pnpm publish --access public
+      - name: Publish
+        run: |
           cd ..
           pnpm i
           pnpm build

diff --git a/addon/package.json b/addon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rubick-native-addon",
-  "version": "0.0.4",
+  "version": "0.0.5-beta",
   "main": "index.js",
   "types": "index.d.ts",
   "napi": {

diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "rubick-native",
-  "version": "0.0.0",
+  "version": "0.0.1-beta",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc -d",
-    "postinstall": "cd addon && npm install --production"
+    "postinstall": "cd addon && npm install --only=prod"
   },
   "devDependencies": {
     "@types/node": "^20.7.1",