Skip to content

Commit

Permalink
Merge branch 'main' into 8-develop-login-page-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
CadenBPurdue authored Feb 20, 2025
2 parents ce78209 + 1baa7de commit d6f84b3
Show file tree
Hide file tree
Showing 6 changed files with 125 additions and 80 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/build-electron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ jobs:
echo "FIREBASE_AUTH_DOMAIN=${{ secrets.FIREBASE_AUTH_DOMAIN }}" >> .env
echo "FIREBASE_PROJECT_ID=${{ secrets.FIREBASE_PROJECT_ID }}" >> .env
echo "FIREBASE_STORAGE_BUCKET=${{ secrets.FIREBASE_STORAGE_BUCKET }}" >> .env
echo "SPOTIFY_CLIENT_ID=${{ secrets.SPOTIFY_CLIENT_ID }}" >> .env
echo "SPOTIFY_CLIENT_SECRET=${{ secrets.SPOTIFY_CLIENT_SECRET }}" >> .env
echo "APPLE_TEAM_ID=${{ secrets.APPLE_TEAM_ID }}" >> .env
echo "APPLE_KEY_ID=${{ secrets.APPLE_KEY_ID }}" >> .env
echo "APPLE_PRIVATE_KEY=${{ secrets.APPLE_PRIVATE_KEY }}" >> .env
- name: Build app
run: npm run build
Expand Down Expand Up @@ -64,3 +69,10 @@ jobs:
with:
name: build-${{ inputs.os }}-${{ inputs.arch }}
path: dist_electron/*.exe

- name: Upload Artifacts Linux
if: inputs.os == 'ubuntu-latest'
uses: actions/upload-artifact@v4
with:
name: build-${{ inputs.os }}-${{ inputs.arch }}
path: dist_electron/*.deb
File renamed without changes.
5 changes: 3 additions & 2 deletions .github/workflows/release-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@ jobs:
- name: Download Build Artifacts
uses: actions/download-artifact@v4
with:
path: dist_electron
path: .
merge-multiple: true # Merge files into the root

- name: Create GitHub Release
uses: softprops/action-gh-release@v2
with:
draft: true
files: dist_electron/*
files: ./* # Correct path to the renamed files
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
178 changes: 105 additions & 73 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "harmony",
"version": "0.0.2",
"version": "0.0.3",
"description": "A music playlist sharing application",
"author": "Adam Kahl <akahl@purdue.edu>",
"main": "src/main/main.js",
Expand Down
Loading

0 comments on commit d6f84b3

Please sign in to comment.