Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ref: Update actions #347

Merged
merged 45 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
5674a34
ci: Upgrade upload-artifact action to versio n 3
RobertGemmaJr Dec 6, 2023
a14681e
chore: Test upgraded package version
RobertGemmaJr Dec 6, 2023
4f65865
chore: TODOs
RobertGemmaJr Dec 6, 2023
965bea8
ci: Test grep
RobertGemmaJr Dec 6, 2023
062b9a7
ci: Test
RobertGemmaJr Dec 6, 2023
acd0ae5
ci: test
RobertGemmaJr Dec 6, 2023
619d819
ci: Test new cat
RobertGemmaJr Dec 6, 2023
d7f45c9
ci: Test npm view
RobertGemmaJr Dec 6, 2023
9bbcf23
ci: Revert to jq
RobertGemmaJr Dec 6, 2023
11707ed
ci: Revert to npm test
RobertGemmaJr Dec 6, 2023
58ae43d
ci: revert to jq
RobertGemmaJr Dec 6, 2023
6a7beb7
ci: Test env variables
RobertGemmaJr Dec 6, 2023
e234155
ci: Test workflow with set variables
RobertGemmaJr Dec 6, 2023
486aec0
ci: Just test cat
RobertGemmaJr Dec 6, 2023
f198984
ci: Fix quote
RobertGemmaJr Dec 6, 2023
2261fd8
ci: Test package name and version
RobertGemmaJr Dec 6, 2023
6c5cdc7
ci: name, verison, and test
RobertGemmaJr Dec 6, 2023
54cca7b
ci: Update env variable
RobertGemmaJr Dec 6, 2023
9feece3
ci: Test name and version in the same line
RobertGemmaJr Dec 6, 2023
3b5c262
ci: Test
RobertGemmaJr Dec 6, 2023
6c5b3c8
ci: Test with package info
RobertGemmaJr Dec 6, 2023
8398fa3
ci: test full workflow
RobertGemmaJr Dec 6, 2023
e8df03e
ci: test file paths
RobertGemmaJr Dec 6, 2023
6cb3f00
ci: test
RobertGemmaJr Dec 6, 2023
89ae9c7
ci: Test full workflow with paths echo
RobertGemmaJr Dec 6, 2023
5d7e036
ci: Test on windows with early return
RobertGemmaJr Dec 6, 2023
d1f901d
ci: test echo
RobertGemmaJr Dec 6, 2023
7cbeef1
ci: Test with space in name
RobertGemmaJr Dec 6, 2023
1b6b0ae
ci: test new echo
RobertGemmaJr Dec 6, 2023
d438d86
ci: Test outputs
RobertGemmaJr Dec 6, 2023
933e296
ci: fix echo
RobertGemmaJr Dec 6, 2023
f81aefc
ci: Test echo name
RobertGemmaJr Dec 6, 2023
3931487
ci: Test echo as raw
RobertGemmaJr Dec 6, 2023
b57f769
ci: Test windows with bash shell
RobertGemmaJr Dec 6, 2023
ed119da
ci: Test with ENV
RobertGemmaJr Dec 6, 2023
17678f4
ci: Test echo
RobertGemmaJr Dec 6, 2023
e12c5f2
ci: Test with both shells
RobertGemmaJr Dec 6, 2023
faa5ed9
ci: Test on Widnows
RobertGemmaJr Dec 6, 2023
fd490dc
chore: TODO
RobertGemmaJr Dec 6, 2023
a6cb9c1
ref: Refactor other actions
RobertGemmaJr Dec 6, 2023
6126785
Merge branch 'main' into ref-old-actions
RobertGemmaJr Dec 8, 2023
b25ab7d
chore: Update workflow names
RobertGemmaJr Dec 8, 2023
da0aa0a
Merge branch 'main' into ref-old-actions
RobertGemmaJr Dec 8, 2023
f411211
chore: Update package version to 3.2.6
RobertGemmaJr Dec 8, 2023
afacfd0
Merge branch 'main' into ref-old-actions
RobertGemmaJr Dec 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release
name: 🚀 Release

# Runs the build and package scripts when a new tagged release is publishe, created or edited
# Note that this runs for both releases and pre-releases: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release
Expand Down Expand Up @@ -64,23 +64,29 @@ jobs:

# Upload installers to github release
# TODO: Can these be combined based on matrix.os???
- name: Set package version and name
uses: brown-ccv/gh-actions/get-package-info@main
# TODO: Overwrite files if they exist?
# Get package info
- name: Get package name and version
id: package_info
run: |
echo "name=$(cat package.json | jq -r '.name')" >> $GITHUB_OUTPUT
echo "version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
shell: bash

- name: ⬆ Upload installer to release - Windows
if: startsWith(matrix.os, 'windows')
uses: svenstaro/upload-release-action@v2
with:
file: out/make/squirrel.windows/x64/${{ steps.package_info.outputs.package_name }}-${{ steps.package_info.outputs.package_version }} Setup.exe
asset_name: ${{ steps.package_info.outputs.package_name }}-${{ steps.package_info.outputs.package_version }}-${{ matrix.setting }}-setup.exe
file: out/make/squirrel.windows/x64/${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }} Setup.exe
asset_name: ${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-${{ matrix.setting }}-setup.exe
tag: ${{ github.ref }}
repo_token: ${{ secrets.GITHUB_TOKEN }}
- name: ⬆ Upload installer to release - macOS
if: startsWith(matrix.os, 'mac')
uses: svenstaro/upload-release-action@v2
with:
file: out/make/${{ steps.package_info.outputs.package_name }}-${{ steps.package_info.outputs.package_version }}-x64.dmg
asset_name: ${{ steps.package_info.outputs.package_name }}-${{ steps.package_info.outputs.package_version }}-${{ matrix.setting }}.dmg
file: out/make/${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-x64.dmg
asset_name: ${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-${{ matrix.setting }}.dmg
tag: ${{ github.ref }}
repo_token: ${{ secrets.GITHUB_TOKEN }}
- name: ⬆ Upload installer to release - Linux
Expand Down Expand Up @@ -128,39 +134,46 @@ jobs:
name: Package for PsiTurk
runs-on: ubuntu-latest
steps:
# Set up Node
# Set up runner
- name: ⬇️ Checkout repo
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v3
with:
node-version-file: .nvmrc
cache: npm
- name: 🐍 Setup Python
uses: actions/setup-python@v4
with:
python-version: "3.10"

# Install dependencies
- name: 📥 Install Dependencies
run: npm ci
- name: 📥 Install PsiTurk
run: pip install psiturk

# Build the app
- name: ⚒ Build
run: npm run build

# Package on PsiTurk
- name: Set package version and name
uses: brown-ccv/gh-actions/get-package-info@main
# Get package info
- name: Get package name and version
id: package_info
- name: 🐍 Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.7
- name: 📥 Install PsiTurk
run: pip install psiturk
run: |
echo "name=$(cat package.json | jq -r '.name')" >> $GITHUB_OUTPUT
echo "version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
shell: bash

# Package on PsiTurk
- name: 📦 Create Psiturk Build
run: |
cd psiturkit
./psiturk-it -p ${{ steps.package_info.outputs.package_name }}-psiturk
./psiturk-it -p ${{ steps.package_info.outputs.name }}-psiturk
- name: ⬆ Upload PsiTurk Build
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: psiturk-build
path: psiturkit/${{ steps.package_info.outputs.package_name }}-psiturk
path: psiturkit/${{ steps.package_info.outputs.name }}-psiturk
if-no-files-found: error
29 changes: 19 additions & 10 deletions .github/workflows/workflow-package.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Package Workflow
name: 📦 Package Workflow

# Workflow dispatch for packaging an electron executable
on:
Expand Down Expand Up @@ -42,6 +42,7 @@ jobs:
# Set up runner
- name: ⬇️ Checkout repo
uses: actions/checkout@v4

- name: ⎔ Setup node
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -76,26 +77,34 @@ jobs:
if: startsWith(matrix.os, 'ubuntu')
run: npm run package:linux

# Upload installers to github action
- name: Set package version and name
uses: brown-ccv/gh-actions/get-package-info@main
# Get package info
- name: Get package name and version
id: package_info
run: |
echo "name=$(cat package.json | jq -r '.name')" >> $GITHUB_OUTPUT
echo "version=$(cat package.json | jq -r '.version')" >> $GITHUB_OUTPUT
shell: bash

# Upload installers to github action
- name: ⬆ Upload installer - Windows
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: startsWith(matrix.os, 'windows')
with:
name: ${{ format('win-installer-{0}', github.event.inputs.setting) }}
path: out/make/squirrel.windows/x64/${{ steps.package_info.outputs.package_name }}-${{ steps.package_info.outputs.package_version }} Setup.exe
path: out/make/squirrel.windows/x64/${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }} Setup.exe
if-no-files-found: error

- name: ⬆ Upload installer - Mac
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: startsWith(matrix.os, 'mac')
with:
name: ${{ format('mac-installer-{0}', github.event.inputs.setting) }}
path: out/make/${{ steps.package_info.outputs.package_name }}-${{ steps.package_info.outputs.package_version }}-x64.dmg
path: out/make/${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-x64.dmg
if-no-files-found: error
- name: ⬆ Upload installer - Linux
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: startsWith(matrix.os, 'ubuntu')
with:
name: ${{ format('linux-installer-{0}', github.event.inputs.setting) }}
path: out/make/deb/x64/${{ steps.package_info.outputs.package_name }}_${{ steps.package_info.outputs.package_version }}_amd64.deb
path: out/make/deb/x64/${{ steps.package_info.outputs.name }}_${{ steps.package_info.outputs.version }}_amd64.deb
if-no-files-found: error
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"email": "[email protected]",
"url": "https://ccv.brown.edu"
},
"version": "3.2.5",
"version": "3.2.6",
"honeycombVersion": "",
"license": "MIT",
"private": true,
Expand Down