Skip to content

Commit

Permalink
removed old workflow and updated github_token name
Browse files Browse the repository at this point in the history
  • Loading branch information
TwanLuttik committed Oct 4, 2023
1 parent fcf8084 commit b5ada75
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 115 deletions.
28 changes: 14 additions & 14 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
profile: minimal
toolchain: stable
override: true

# Check if there is a cache of the pnpm modules and restore it
- name: Cache pnpm modules
uses: actions/cache@v2
Expand All @@ -58,15 +58,15 @@ jobs:
# Build the project for MacOS Silicon
- name: Build for MacOS Silicon
run: pnpm build:app:silicon

# Archive the MacOS Silicon build artifacts
- name: Archive MacOS Silicon artifacts
uses: actions/upload-artifact@v3
with:
name: macos-silicon
# The current path is very specific and might need adjustments with any changes in the file name or structure. A more generalized path (e.g., src-tauri/target/release/bundle/dmg/*.dmg) would be preferable as it's more flexible and resilient to such changes.
path: src-tauri/target/aarch64-apple-darwin/release/bundle/dmg/*.dmg
if-no-files-found: error # or 'warn' or 'ignore'
if-no-files-found: error # or 'warn' or 'ignore'

# Build the project for MacOS Intel
- name: Build for MacOS Intel
Expand All @@ -79,8 +79,8 @@ jobs:
name: macos-intel
# The current path is very specific and might need adjustments with any changes in the file name or structure. A more generalized path (e.g., src-tauri/target/release/bundle/dmg/*.dmg) would be preferable as it's more flexible and resilient to such changes.
path: src-tauri/target/x86_64-apple-darwin/release/bundle/dmg/*.dmg
if-no-files-found: error # or 'warn' or 'ignore'
if-no-files-found: error # or 'warn' or 'ignore'

# Build the project for MacOS Universal (both Silicon and Intel)
- name: Build for MacOS Universal
run: pnpm build:app:universal
Expand All @@ -92,7 +92,7 @@ jobs:
name: macos-universal
# The current path is very specific and might need adjustments with any changes in the file name or structure. A more generalized path (e.g., src-tauri/target/release/bundle/dmg/*.dmg) would be preferable as it's more flexible and resilient to such changes.
path: src-tauri/target/universal-apple-darwin/release/bundle/dmg/*.dmg
if-no-files-found: error # or 'warn' or 'ignore'
if-no-files-found: error # or 'warn' or 'ignore'

# Placeholder steps for future implementation for Windows
# Build the project for Windows OS
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
with:
tag_name: ${{ steps.generate_tag.outputs.tag }}
release_name: Release ${{ steps.generate_tag.outputs.tag }}
Expand All @@ -181,18 +181,18 @@ jobs:
- name: Upload Release Asset (MacOS Silicon)
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ${{ steps.get_filename_silicon.outputs.filename }} # adjusted path
asset_path: ${{ steps.get_filename_silicon.outputs.filename }} # adjusted path
asset_name: Ollama-Gui-MacOS-Silicon.dmg
asset_content_type: application/octet-stream

# Get the file name and assign it to an object
- name: Get Intel file name
id: get_filename_intel
run: echo "::set-output name=filename::$(ls /home/runner/work/Ollama-Gui/Ollama-Gui/macos-intel/*.dmg)"

# Print the file name
- name: Echo the Intel file name
run: echo "The Intel file name is ${{ steps.get_filename_intel.outputs.filename }}"
Expand All @@ -201,7 +201,7 @@ jobs:
- name: Upload Release Asset (MacOS Intel)
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ${{ steps.get_filename_intel.outputs.filename }} # adjusted path
Expand All @@ -212,7 +212,7 @@ jobs:
- name: Get Universal file name
id: get_filename_universal
run: echo "::set-output name=filename::$(ls /home/runner/work/Ollama-Gui/Ollama-Gui/macos-universal/*.dmg)"

# Print the file name
- name: Echo the Universal file name
run: echo "The Universal file name is ${{ steps.get_filename_universal.outputs.filename }}"
Expand All @@ -221,9 +221,9 @@ jobs:
- name: Upload Release Asset (MacOS Universal)
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ${{ steps.get_filename_universal.outputs.filename }} # adjusted path
asset_path: ${{ steps.get_filename_universal.outputs.filename }} # adjusted path
asset_name: Ollama-Gui-MacOS-Universal.dmg
asset_content_type: application/octet-stream
101 changes: 0 additions & 101 deletions .github/workflows/release.yml

This file was deleted.

0 comments on commit b5ada75

Please sign in to comment.