Skip to content

Commit

Permalink
Merge pull request #415 from coasys/dev
Browse files Browse the repository at this point in the history
Release 0.7.1
  • Loading branch information
jdeepee authored Oct 23, 2023
2 parents 113559c + 6d430ce commit 6519074
Show file tree
Hide file tree
Showing 38 changed files with 194 additions and 118 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/agent-language-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0

- name: Cache cargo
id: cache-cargo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/direct-message-language-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0

- name: Cache cargo
id: cache-cargo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/file-storage-language-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0

- name: Cache cargo
id: cache-cargo
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0

- name: Cache cargo
id: cache-cargo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
override: true
toolchain: 1.71.1
toolchain: 1.73.0

- name: Install protobuf & cmake
run: brew install protobuf cmake
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0

- name: Install GO
uses: actions/setup-go@v4
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/p-diff-sync-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0
- name: Cache cargo
id: cache-cargo
uses: actions/cache@v3
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0
- name: Cache cargo
id: cache-cargo
uses: actions/cache@v3
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0

- name: Cache cargo
id: cache-cargo
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0

- name: Cache cargo
id: cache-cargo
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0

- name: Cache cargo
id: cache-cargo
Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0

- name: Cache cargo
id: cache-cargo
Expand Down Expand Up @@ -285,7 +285,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0

- name: Cache cargo
id: cache-cargo
Expand Down Expand Up @@ -331,7 +331,7 @@ jobs:
# - uses: actions/checkout@v2
# - uses: actions-rs/toolchain@v1
# with:
# toolchain: 1.71.1
# toolchain: 1.73.0

# - name: Cache cargo
# id: cache-cargo
Expand Down
74 changes: 46 additions & 28 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
fail-fast: false
matrix:
platform: [GH-hosted-ubuntu, macos-latest, windows-latest]
node-version: [18.17.0]
node-version: [16.x]

needs:
- create-release
Expand All @@ -59,18 +59,21 @@ jobs:
uses: actions-rs/toolchain@v1
with:
override: true
toolchain: 1.71.1
toolchain: 1.73.0
- run: rustup target add wasm32-unknown-unknown

- name: Install GO
uses: actions/setup-go@v4
with:
go-version: '1.18'
go-version: '1.20.6'

- name: Install HC
run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"

- name: Install Deno
uses: denoland/setup-deno@v1
with:
deno-version: v1.32.4
- run: rustup target add wasm32-unknown-unknown

- name: install dependencies (ubuntu only)
if: matrix.platform == 'GH-hosted-ubuntu'
Expand All @@ -84,7 +87,7 @@ jobs:

- name: install dependencies (windows only)
if: matrix.platform == 'windows-latest'
run: choco install protoc cmake
run: choco install protoc cmake curl cygwin gnuwin32-m4 libgcc make mingw

- name: get version
run: echo "PACKAGE_VERSION=$(node -p "require('./ui/package.json').version")" >> $GITHUB_ENV
Expand All @@ -95,6 +98,17 @@ jobs:
with:
path: ui

- name: Change package UI version
id: changed_version
if: matrix.platform == 'windows-latest'
run: cd ui && yarn change-ui-version

- name: Extract changed version
id: changed_extract_version
uses: Saionaro/[email protected]
with:
path: ui

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
Expand All @@ -106,10 +120,10 @@ jobs:
- name: Build AD4M-CLI & build Launcher binary (macos/linux-latest)
if: matrix.platform != 'windows-latest'
env:
ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
run: yarn run package-ad4m
Expand All @@ -119,9 +133,7 @@ jobs:
env:
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
run: |
choco install curl cygwin gnuwin32-m4 libgcc make mingw
yarn run package-ad4m
run: yarn run package-ad4m

- name: Upload Release Deb Asset
id: upload-release-deb-asset
Expand Down Expand Up @@ -239,8 +251,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi
asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi
asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi
asset_name: ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi
asset_content_type: application/octet-stream

- name: Upload Release MSI update Asset
Expand All @@ -251,8 +263,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip
asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip
asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip
asset_name: ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip
asset_content_type: application/octet-stream

- name: Upload Release MSI update sig Asset
Expand All @@ -263,21 +275,21 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip.sig
asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip.sig
asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip.sig
asset_name: ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip.sig
asset_content_type: application/octet-stream

- name: Upload Release AD4M CLI Windows Binary
id: upload-release-windows-ad4m-cli-binary
if: matrix.platform == 'windows-latest'
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: D:\a\ad4m\ad4m\target\release\ad4m-x64.exe
asset_name: ad4m-windows-${{ steps.extract_version.outputs.version }}-x64.exe
asset_content_type: application/octet-stream
# - name: Upload Release AD4M CLI Windows Binary
# id: upload-release-windows-ad4m-cli-binary
# if: matrix.platform == 'windows-latest'
# uses: actions/upload-release-asset@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
# asset_path: D:\a\ad4m\ad4m\target\release\ad4m-x64.exe
# asset_name: ad4m-windows-${{ steps.extract_version.outputs.version }}-x64.exe
# asset_content_type: application/octet-stream

npm-publish:
runs-on: GH-hosted-ubuntu
Expand Down Expand Up @@ -309,6 +321,12 @@ jobs:
- name: Build modules
run: yarn run build-libs

- name: Change Package Visibility to Public
run: |
cd core
sed -i 's/"private": true/"private": false/' package.json
- name: Publish core
uses: JS-DevTools/npm-publish@v1
with:
Expand Down Expand Up @@ -340,7 +358,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.71.1
toolchain: 1.73.0
override: true

- name: Install GO
Expand Down
Loading

0 comments on commit 6519074

Please sign in to comment.