-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge staging/4.1.3 into stable/4.1.x. Update 20240312
* commit '441c4d9b6e7aff5f82baa8bbbdde05240e6436f8': (27 commits) Update meta repository (#885) Update meta (#877) Automatically create PRs for commits on staging branches (#865) Change restricter for motion_change_recommendation (#857) Bump github.com/klauspost/compress from 1.17.6 to 1.17.7 (#856) Remove update-generated-files.yml (#854) Update meta repository (#853) Bump github.com/gomodule/redigo from 1.8.9 to 1.9.1 (#852) new settings for one participant multiple times in the LoS (#851) Add identical motions (#846) Enhance motion fields (#844) Update go version (#850) Add motion restriction mode for `is_internal` (#847) Unify name of the openslides-meta submodule (#843) Add new restrictions for LoS extension (#807) (#810) Update meta repository (#841) Bump golang.org/x/sys from 0.16.0 to 0.17.0 (#839) Bump github.com/klauspost/compress from 1.17.5 to 1.17.6 (#836) Use models.yml from meta repo (#834) Bump github.com/jackc/pgx/v5 from 5.5.2 to 5.5.3 (#835) ...
- Loading branch information
Showing
44 changed files
with
2,917 additions
and
1,530 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| name: Copy staging commits to main | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - 'staging/4*' | ||
|
|
||
|
|
||
| jobs: | ||
| create-pr-for-main: | ||
| name: Create PR against main branch | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Checkout main | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| ref: main | ||
|
|
||
| - name: Set git credentials | ||
| run: | | ||
| git config --global user.name openslides-automation | ||
| git config --global user.email [email protected] | ||
| - name: Cherry-pick new commit | ||
| id: cherry-pick | ||
| run: | | ||
| git fetch origin | ||
| git cherry-pick ${{ github.sha }} || { | ||
| echo "error=1" >> $GITHUB_OUTPUT | ||
| git add . | ||
| git cherry-pick --continue | ||
| } | ||
| - name: Generate access token | ||
| uses: tibdex/github-app-token@v2 | ||
| id: generate-token | ||
| with: | ||
| app_id: ${{ secrets.AUTOMATION_APP_ID }} | ||
| private_key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }} | ||
|
|
||
| - name: Create or update PR | ||
| uses: peter-evans/create-pull-request@v6 | ||
| with: | ||
| token: ${{ steps.generate-token.outputs.token }} | ||
| commit-message: ${{ github.event.commits[0].message }} | ||
| branch: apply/commit-${{ github.sha }} | ||
| delete-branch: true | ||
| title: ${{ github.event.commits[0].message }} | ||
| body: "Triggered by commit [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }})\n\n${{ steps.cherry-pick.outputs.error && 'There were conflicts during the cherry-pick. These were commited without any resolving. Please resolve them manually and push the result to this branch before merging.' || 'The cherry-pick was successful without any conflicts. You should be able to simply merge this PR.' }}" | ||
| reviewers: ${{ github.event.commits[0].author.username }} | ||
| assignees: ${{ github.event.commits[0].author.username }} | ||
| labels: staging-port | ||
| milestone: 4 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [submodule "openslides-meta"] | ||
| path = meta | ||
| url = https://github.com/OpenSlides/openslides-meta.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM golang:1.21.6-alpine as base | ||
| FROM golang:1.22.0-alpine as base | ||
| WORKDIR /root/ | ||
|
|
||
| RUN apk add git | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.