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

Update conda environments #48

Merged
merged 11 commits into from
Jan 10, 2022
Merged

Update conda environments #48

merged 11 commits into from
Jan 10, 2022

Conversation

jomey
Copy link
Contributor

@jomey jomey commented Jan 10, 2022

  • Add cookiecutter library to the lock files (checks box in splash page for hackweek web template #38)
  • Update Python to 3.10
  • Run test pipeline for Ubuntu and macOSX
  • Extend test runs for any changes to a GH action
  • Add checks for build script for successful commands

jomey added 3 commits January 10, 2022 11:56
Run the test pipeline with any change to a GH action yml.
Update the conda environments for Ubuntu and Mac OS latest. This bumps
the python version to 3.10 and also adds the `cookiecutter` library. The
latter is needed to build the new landing page.
Ensure that the website can be build for both operating systems.
jomey added 3 commits January 10, 2022 12:28
Check the return values for the build commands to raise an error upon
failure.
The action currently fails as no token is supplied even with publishing
being disabled. GitHub needs a value supplied in order to parse the
action.
@jomey jomey requested a review from JessicaS11 January 10, 2022 19:32
Now that the test action is run on macOS and Linux, the conda lock file
needs to be selected accordingly to create the environment.
@jomey jomey force-pushed the conda/update_locks branch from aa3fa3b to 7f29617 Compare January 10, 2022 20:46
The if condition does not seem to work as expected (yet). Trying to
compare the 'raw' value.
@jomey jomey force-pushed the conda/update_locks branch from 7f29617 to 2b00409 Compare January 10, 2022 20:55
Use a default value instead of requiring a 'dummy' value across usages.
@jomey
Copy link
Contributor Author

jomey commented Jan 10, 2022

Took a little, but this is ready for review now. The pull_request_target action is failing as expected with main currently not in good shape.

@scottyhq
Copy link
Contributor

Thanks @jomey this is looking great! For the preview workflow to work as expected again, we'll need to make a small change to the following lines:

steps:
- name: Checkout repository
uses: actions/checkout@v2

To -->

    - uses: actions/checkout@v2
      with:
        ref: ${{ github.event.pull_request.head.sha }}

(I think this maybe changed accidentally in the latest revamp)...

@jomey
Copy link
Contributor Author

jomey commented Jan 10, 2022

Can we allow the 'merge and commit' strategy for PRs for this repo again?
I like having the individual commits for the affected files of this PR. Squashing them into one commit makes it harder to re-trace what and why files have been changed later on in my perspective. That's where concise commits and associated messages come in handy and a squash would take this away again.

@jomey jomey closed this Jan 10, 2022
@jomey jomey reopened this Jan 10, 2022
@jomey jomey merged commit 8984173 into main Jan 10, 2022
@jomey jomey deleted the conda/update_locks branch January 10, 2022 22:23
@scottyhq
Copy link
Contributor

Can we allow the 'merge and commit' strategy for PRs for this repo again?

Done... I like squash and merge for convenience especially with really long PRs with a bunch of commits for testing, but you're totally right that ideally we'd rebase those to maintain a more concise and logical history...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants