Skip to content

Commit

Permalink
build using main (temp hardcode main for download files)
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelPesce committed Jul 10, 2024
1 parent 9f576d8 commit c796428
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: App build
on:
push:
branches:
- "1.0rc0"
- "1.0.0"

defaults:
run:
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Add project pareto version to .env file
working-directory: ./electron/ui
run: |
echo REACT_APP_PARETO_VERSION=1.0.0rc1 >> .env
echo REACT_APP_PARETO_VERSION=1.0.0 >> .env
- name: Install Electron JS dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Add project pareto version to .env file
working-directory: ./electron/ui
run: |
echo REACT_APP_PARETO_VERSION=1.0.0rc1 >> .env
echo REACT_APP_PARETO_VERSION=1.0.0 >> .env
# - name: Install pint
# run: pip install pint==0.23
Expand Down
8 changes: 5 additions & 3 deletions electron/ui/src/components/FileUploadModal/FileUploadModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ export default function FileUploadModal(props) {
const [ file, setFile ] = useState(null)
const fileTypes = ["xlsx", "kmz", "kml"];

const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/strategic_permian_demo.xlsx"
const workshopFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+process.env.REACT_APP_PARETO_VERSION+"/pareto/case_studies/workshop_baseline_all_data.xlsx"
const workshopFileName = "workshop_baseline_all_data_"+process.env.REACT_APP_PARETO_VERSION+".xlsx"
let tempVersion = "main"

const sampleFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+tempVersion+"/pareto/case_studies/strategic_permian_demo.xlsx"
const workshopFileUrl = "https://github.com/project-pareto/project-pareto/raw/"+tempVersion+"/pareto/case_studies/workshop_baseline_all_data.xlsx"
const workshopFileName = "workshop_baseline_all_data_"+tempVersion+".xlsx"

const { port } = useApp()

Expand Down

0 comments on commit c796428

Please sign in to comment.