chore: cleanup and due credits

Signed-off-by: Aaron <29749331+aarnphm@users.noreply.github.com>
bentoml · Jun 24, 2023 · ee318ed · ee318ed
1 parent 5890ecd
commit ee318ed
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 53 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -24,6 +24,6 @@ updates:
   - package-ecosystem: pip
     directory: '/'
     schedule:
-      interval: 'daily'
+      interval: 'weekly'
     open-pull-requests-limit: 5
     versioning-strategy: increase-if-necessary
diff --git a/.github/workflows/auto-dependabot.yml b/.github/workflows/auto-dependabot.yml
@@ -1,3 +1,17 @@
+# Copyright 2023 BentoML Team. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 name: auto-dependabot
 on:
   pull_request_target:
@@ -6,7 +20,7 @@ on:
       - reopened
       - synchronize
     branches:
-      - master
+      - main
 jobs:
   dependabot:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/binary-releases.yml b/.github/workflows/binary-releases.yml
@@ -1,3 +1,4 @@
+# modified workflow from ofek/hatch, big kudos to them.
 name: binary-distribution
 on:
   push:
@@ -227,7 +228,7 @@ jobs:
           name: installers
           path: installers/*
   macos-packaging:
-    name: Build macOS installer and sign/notarize artifacts
+    name: Build macOS installer
     if: github.event.pull_request.head.repo.full_name == github.repository
     needs: binaries
     runs-on: macos-12
@@ -257,41 +258,6 @@ jobs:
           for f in archives/*; do
             tar -xzf "$f" -C bin
           done
-      # - name: Write credentials
-      #   env:
-      #     APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE: '${{ secrets.APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE }}'
-      #     APPLE_DEVELOPER_ID_APPLICATION_PRIVATE_KEY: '${{ secrets.APPLE_DEVELOPER_ID_APPLICATION_PRIVATE_KEY }}'
-      #     APPLE_APP_STORE_CONNECT_API_DATA: '${{ secrets.APPLE_APP_STORE_CONNECT_API_DATA }}'
-      #   run: |-
-      #     echo "$APPLE_DEVELOPER_ID_APPLICATION_CERTIFICATE" > /tmp/certificate.pem
-      #     echo "$APPLE_DEVELOPER_ID_APPLICATION_PRIVATE_KEY" > /tmp/private-key.pem
-      #     echo "$APPLE_APP_STORE_CONNECT_API_DATA" > /tmp/app-store-connect.json
-      # # https://developer.apple.com/documentation/security/hardened_runtime
-      # - name: Sign binaries
-      #   run: |-
-      #     for f in bin/*; do
-      #       rcodesign sign -vv \
-      #       --pem-source /tmp/certificate.pem \
-      #       --pem-source /tmp/private-key.pem \
-      #       --code-signature-flags runtime \
-      #       "$f"
-      #     done
-      # # https://developer.apple.com/documentation/security/notarizing_macos_software_before_distribution
-      # - name: Notarize binaries
-      #   run: |-
-      #     mkdir notarize-bin
-      #
-      #     cd bin
-      #     for f in *; do
-      #       zip "../notarize-bin/$f.zip" "$f"
-      #     done
-      #
-      #     cd ../notarize-bin
-      #     for f in *; do
-      #       rcodesign notary-submit -vv \
-      #       --api-key-path /tmp/app-store-connect.json \
-      #       "$f"
-      #     done
       - name: Archive binaries
         run: |-
           rm archives/*
@@ -318,26 +284,16 @@ jobs:
         id: stage
         run: |-
           mkdir staged
-          mkdir signed
           mv build/*/release/*/*.app staged
           app_bundle="$(ls staged)"
           app_name="${app_bundle:0:${#app_bundle}-4}"
 
           echo "app-bundle=$app_bundle" >> "$GITHUB_OUTPUT"
           echo "app-name=$app_name-${{ env.VERSION }}.dmg" >> "$GITHUB_OUTPUT"
           echo "dmg-file=$app_name-${{ env.VERSION }}.dmg" >> "$GITHUB_OUTPUT"
-      # - name: Sign app bundle
-      #   run: >-
-      #     rcodesign sign -vv --pem-source /tmp/certificate.pem --pem-source /tmp/private-key.pem "staged/${{ steps.stage.outputs.app-bundle }}" "signed/${{ steps.stage.outputs.app-bundle }}"
       - name: Create DMG
         run: >-
-          create-dmg --volname "${{ steps.stage.outputs.app-name }}" --hide-extension "${{ steps.stage.outputs.app-bundle }}" --window-pos 200 120 --window-size 800 400 --icon-size 100 --app-drop-link 600 185 "${{ steps.stage.outputs.dmg-file }}" signed
-      # - name: Sign DMG
-      #   run: >-
-      #     rcodesign sign -vv --pem-source /tmp/certificate.pem --pem-source /tmp/private-key.pem "${{ steps.stage.outputs.dmg-file }}" "${{ steps.stage.outputs.dmg-file }}"
-      # - name: Notarize DMG
-      #   run: >-
-      #     rcodesign notary-submit --api-key-path /tmp/app-store-connect.json --staple "${{ steps.stage.outputs.dmg-file }}"
+          create-dmg --volname "${{ steps.stage.outputs.app-name }}" --hide-extension "${{ steps.stage.outputs.app-bundle }}" --window-pos 200 120 --window-size 800 400 --icon-size 100 --app-drop-link 600 185 "${{ steps.stage.outputs.dmg-file }}" staged
       - name: Upload binaries
         uses: actions/upload-artifact@v3
         with:
@@ -377,10 +333,6 @@ jobs:
         with:
           name: installers
           path: installers
-      - name: Push Python artifacts to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.8.6
-        with:
-          skip-existing: true
       - name: Add assets to current release
         uses: softprops/action-gh-release@v1
         with:

diff --git a/pyoxidizer.bzl b/pyoxidizer.bzl
@@ -1,3 +1,17 @@
+# Copyright 2023 BentoML Team. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 """Entrypoint for using pyoxidizer to package openllm into standalone binary distribution."""
 
 VERSION = VARS["version"]