Skip to content

Commit

Permalink
Address CI Action EOL (#503)
Browse files Browse the repository at this point in the history
* use upload-artifact v4 with explicit names

* favor local gems in CI

* update github templates for issues & PRs

* fix indenting in gemfile
  • Loading branch information
vtnate authored Jan 31, 2025
1 parent d17059a commit ed17237
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 18 deletions.
12 changes: 9 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ assignees: ''

### Expected behavior

_A clear and concise description of what you expected to happen._
<!--A clear and concise description of what you expected to happen.-->

### Actual behavior

_A clear and concise description of what actually happens._
<!--A clear and concise description of what actually happens.-->

### To Reproduce

Expand All @@ -23,6 +23,12 @@ Steps to reproduce the behavior:
1. Enter '...'
1. Enter '...'

### Version
<!--Please fill in your version of URBANopt to help us diagnose the issue.-->
<!--If you are not on the [newest version](https://docs.urbanopt.net/developer_resources/compatibility_matrix.html), please update.-->
<!--Review the [release notes](https://docs.urbanopt.net/developer_resources/known_issues.html) for help with known issues.-->
URBANopt: `X.Y.Z`

### Additional context

_E.g.: Windows, Mac, Linux? Are you behind a firewall? Do you have additional security constraints?_
<!--Are you behind a firewall? Do you have additional security constraints?-->
16 changes: 8 additions & 8 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
### Is your feature request related to a problem? Please describe
<!--A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]-->

**Describe the solution you'd like**
A clear and concise description of what you want to happen.
### The solution you'd like
<!--A clear and concise description of what you want to happen.-->

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
### Alternatives you've considered
<!--A clear and concise description of any alternative solutions or features you've considered.-->

**Additional context**
Add any other context or screenshots about the feature request here.
### Additional context
<!--Add any other context or screenshots about the feature request here.-->
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@

- [ ] Unit tests have been added or updated
- [ ] All ci tests pass (green)
- [ ] An [issue](https://github.com/urbanopt/urbanopt-cli/issues) has been created (which will be used for the changelog)
- [ ] This PR has been labeled appropriately (which will be used for the changelog)
- [ ] This branch is up-to-date with develop
7 changes: 3 additions & 4 deletions .github/workflows/nightly_ci_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
# Favor_Local_Gems enforces develop branch of all Ruby dependencies
# This is our canary in the coal mine! If any simulation tests fail, comment this and retry.
# If CI is then successful, we have a breaking change in a dependency somewhere.
# FAVOR_LOCAL_GEMS: true
FAVOR_LOCAL_GEMS: true
GEM_DEVELOPER_KEY: ${{ secrets.GEM_DEVELOPER_KEY }}
UO_NUM_PARALLEL: 4
# GHA machines have 4 cores. Trying to run more concurrently will slow everything down.
Expand Down Expand Up @@ -56,11 +56,10 @@ jobs:
run: bundle exec rspec -e 'Run and work with a small ${{ matrix.simulation-type }} simulation'
- name: Upload artifacts
# Save results for examination - useful for debugging
uses: actions/upload-artifact@v3
# Using v4 would mean we have to change our path design, and/or the test dir names
uses: actions/upload-artifact@v4
# Only upload if a previous step fails
if: failure()
with:
name: rspec_results
name: rspec_results_${{ matrix.simulation-type }}
path: artifact.zip
retention-days: 7 # save for 1 week then delete
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
# gem 'urbanopt-core', github: 'URBANopt/urbanopt-core-gem', branch: 'master'

if allow_local && File.exist?('../urbanopt-scenario-gem')
gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
gem 'urbanopt-scenario', path: '../urbanopt-scenario-gem'
elsif allow_local
gem 'urbanopt-scenario', github: 'URBANopt/urbanopt-scenario-gem', branch: 'develop'
end
Expand All @@ -36,7 +36,7 @@ elsif allow_local
end

if allow_local && File.exist?('../urbanopt-reopt-gem')
gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
gem 'urbanopt-reopt', path: '../urbanopt-reopt-gem'
elsif allow_local
gem 'urbanopt-reopt', github: 'URBANopt/urbanopt-reopt-gem', branch: 'develop'
end
Expand Down

0 comments on commit ed17237

Please sign in to comment.