-
Notifications
You must be signed in to change notification settings - Fork 125
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
sql: release version autoincrement #983
Conversation
.github/workflows/sql-release.yml
Outdated
# - name: Install Protoc | ||
# uses: arduino/setup-protoc@v1 | ||
# with: | ||
# repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
# version: '21.5' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you know why this installation option doesn't work? It seems to be widely used. We may also need protoc on the golang side soon, so would be nice to understand
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are we using any cutting-edge features or could we just downgrade to the highest version it supports until this issue is resolved?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pjain1 , I wonder if need that specific version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.github/workflows/sql-release.yml
Outdated
- name: Push version changes | ||
uses: EndBug/add-and-commit@v7 | ||
with: | ||
default_author: github_actions | ||
add: sql/pom.xml | ||
message: librillsql release v${{ steps.maven-version.outputs.version }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is going to cause a push directly to main
, which feels a little dangerous – we would prefer always to have manual merges to main
. I can see a few options:
- Either run this once per PR and commit the version update to the PR. This has the risk that two simultaneous PRs will update to the same version, which requires manual intervention.
- Or, have the developer manually bump the version (put the command in
sql/README.md
for convenience) and then have CI check that a pull request does not have the same version number as the one onmain
(so we don't forget) - Or, don't automatically release on merges to main – come up with another release approach (like a manually triggered workflow that checks that the version number has been updated)
- Or, just use SHAs as version numbers
Any other ideas?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think it's more dangerous than committing manually. But as a second option I can propose manual version change by PR committer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've changed it to autoincrement in a PR branch.
It checks version on 'push' and PR approval.
sql/pom.xml
Outdated
<plugin> | ||
<groupId>org.codehaus.mojo</groupId> | ||
<artifactId>versions-maven-plugin</artifactId> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: empty newline
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
.github/workflows/sql-release.yml
Outdated
mvn package -Pnative-lib | ||
mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn test | ||
mvn --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn package -Pnative-lib |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it necessary to add these flags here or could they be set in the pom.xml
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
moved to the config file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still needs to be removed from this file?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed
.github/workflows/sql-release.yml
Outdated
# - os: windows todo fix windows builds, depends on setup-protoc action https://github.com/arduino/setup-protoc/issues/33 | ||
# arch: amd64 | ||
# runner: windows-latest |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add Windows back now that we fixed the protoc version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added
.github/workflows/sql-test.yml
Outdated
version_increment: | ||
runs-on: ubuntu-latest | ||
steps: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of duplicating version_increment
in both sql-test
and sql-version-check
, can you have it just in sql-version-check
and then make the action run for both pull_request
AND pull_request_review
triggers?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated
.github/workflows/sql-test.yml
Outdated
# - os: windows todo see sql-release.yml | ||
# arch: amd64 | ||
# runner: windows-latest |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same comment about adding back as in sql-release
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed
* sql: release version autoincrement * sql: release version autoincrement * sql: release version autoincrement * sql: release version autoincrement * sql: release version autoincrement * sql: release version autoincrement * sql: release version autoincrement * sql: release version autoincrement * sql: release version autoincrement * sql: release version autoincrement * sql: release version autoincrement * sql: release version autoincrement * sql: release version autoincrement * librillsql release v0.1.1 * sql: release version autoincrement * sql: version autoincrement * sql: version autoincrement * sql: version autoincrement * sql: version autoincrement * sql: version autoincrement * sql: version autoincrement * sql: version autoincrement * sql: version autoincrement * sql: version autoincrement * sql: version autoincrement * fixes Co-authored-by: egor-ryashin <egor.ryashin@rilldata.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
version autoincrement & protoc fix for Github Actions