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

Feature/vote decrypt #727

Draft
wants to merge 57 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
fdc56b4
Crypto preperation (#597)
ostcar Dec 10, 2022
b7250a3
Merge remote-tracking branch 'upstream/main' into feature/vote-decrypt
ostcar Jun 14, 2023
36903b6
Merge remote-tracking branch 'upstream/main' into feature/vote-decrypt
ostcar Jul 19, 2023
5f250dd
Merge remote-tracking branch 'upstream/main' into feature/vote-decrypt
ostcar Feb 2, 2024
63ee905
Merge branch 'main' into feature/vote-decrypt
jsangmeister Feb 19, 2024
521eba3
new settings for one participant multiple times in the LoS (#851)
Elblinator Feb 21, 2024
2bc9975
Bump github.com/gomodule/redigo from 1.8.9 to 1.9.1 (#852)
dependabot[bot] Feb 21, 2024
64a6250
Update meta repository (#853)
openslides-automation[bot] Feb 22, 2024
635cb93
Remove update-generated-files.yml (#854)
jsangmeister Feb 22, 2024
f5bc3ba
Bump github.com/klauspost/compress from 1.17.6 to 1.17.7 (#856)
dependabot[bot] Feb 22, 2024
957df89
Change restricter for motion_change_recommendation (#857)
ostcar Feb 26, 2024
da7cd2c
Bump github.com/gomodule/redigo from 1.9.1 to 1.9.2 (#858)
dependabot[bot] Feb 26, 2024
2fa7f21
Update meta repository (#860)
openslides-automation[bot] Feb 27, 2024
2dbdadc
Restricter: New restriction user/B (#859)
ostcar Feb 27, 2024
b34559b
Update meta repository (#863)
openslides-automation[bot] Feb 28, 2024
17f1f68
Automatically create PRs for commits on staging branches (#865) (#867)
openslides-automation[bot] Feb 29, 2024
87e4dae
Update meta repository (#868)
openslides-automation[bot] Mar 1, 2024
3d96348
Update meta repository (#869)
openslides-automation[bot] Mar 1, 2024
db780f7
Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (#871)
dependabot[bot] Mar 2, 2024
1c572cc
Yaml (#849)
ostcar Mar 2, 2024
0cdd772
Fixes requests from anonymous user (#873)
ostcar Mar 4, 2024
789ae44
Add Maybe-Type for non required fields (#872)
ostcar Mar 4, 2024
11516da
Update meta repository (#875)
openslides-automation[bot] Mar 4, 2024
8a97112
Add free text submitter field (#864)
jsangmeister Mar 4, 2024
e1e160d
Update meta repository (#878)
openslides-automation[bot] Mar 4, 2024
fda9caf
Bump github.com/jackc/pgx/v5 from 5.5.3 to 5.5.4 (#880)
dependabot[bot] Mar 5, 2024
87f029f
Bump golang.org/x/sys from 0.17.0 to 0.18.0 (#879)
dependabot[bot] Mar 5, 2024
c1c8db0
Automatically close feature branch issues (#882)
jsangmeister Mar 6, 2024
2a855fd
Bump golang from 1.22.0-alpine to 1.22.1-alpine (#883)
dependabot[bot] Mar 6, 2024
63cf74c
Update meta repository (#881)
openslides-automation[bot] Mar 6, 2024
103264a
Bump github.com/alecthomas/kong from 0.8.1 to 0.9.0 (#884)
dependabot[bot] Mar 11, 2024
cd07e7e
Update meta repository (#887)
openslides-automation[bot] Mar 12, 2024
7d85606
Bump github.com/jackc/pgx/v5 from 5.5.4 to 5.5.5 (#886)
dependabot[bot] Mar 12, 2024
635881e
Update meta repository (#889)
openslides-automation[bot] Mar 14, 2024
e518a1c
Update meta repository (#891)
openslides-automation[bot] Mar 14, 2024
92f1b94
Fix LoS projecion for interposed question (#890)
luisa-beerboom Mar 18, 2024
29b93d1
Long polling fallback (#833)
ostcar Mar 19, 2024
54aa315
Use default routes for profiling (#874)
ostcar Mar 19, 2024
5772edf
Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (#896)
dependabot[bot] Mar 19, 2024
46c80e9
Update meta repository (#892)
openslides-automation[bot] Mar 20, 2024
2fbab4a
Bump github.com/docker/docker (#897)
dependabot[bot] Mar 20, 2024
8e18862
Run go generate for new los setting (#888)
luisa-beerboom Mar 21, 2024
2d5cdea
Update meta repository (#899)
openslides-automation[bot] Mar 21, 2024
81649a3
Update meta repository (#901)
openslides-automation[bot] Mar 26, 2024
6b02ee5
Fix close-issues workflow (#902)
jsangmeister Mar 26, 2024
eaa35d0
Bump golang.org/x/sys from 0.18.0 to 0.19.0 (#909)
dependabot[bot] Apr 8, 2024
fe8599e
Update meta repository (#903)
openslides-automation[bot] Apr 8, 2024
9fa0118
Bump golang.org/x/sync from 0.6.0 to 0.7.0 (#908)
dependabot[bot] Apr 8, 2024
ceb28c4
Fix chyron structure level not displayed (#905)
bastianjoel Apr 9, 2024
75ccbb6
Fix closes-issues action (#913)
jsangmeister Apr 9, 2024
9f284ce
Run go generate for backend #2348 (#911)
luisa-beerboom Apr 10, 2024
72e0dc6
Extend current speaking structure level slide (#915)
bastianjoel Apr 10, 2024
f5c958c
Update meta repository (#912)
openslides-automation[bot] Apr 10, 2024
63ded80
Update meta repository (#916)
openslides-automation[bot] Apr 16, 2024
06e920a
Merge branch 'main' into feature/vote-decrypt
Jun 4, 2024
5a8aedd
Fixed duplicate function
Jun 4, 2024
086a118
Merge branch 'main' into feature/vote-decrypt
Jun 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions .github/workflows/staging-to-main.yml
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 openslides-automation@users.noreply.github.com

- 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
7 changes: 6 additions & 1 deletion internal/autoupdate/flow.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,15 @@ func NewFlow(lookup environment.Environmenter, messageBus flow.Updater) (*Flow,
}

vote := datastore.NewFlowVoteCount(lookup)
// TODO: Merge the two vote flows into one
vote2 := datastore.NewVoteDecryptPubKeySource(lookup)

combined := flow.Combine(
postgres,
map[string]flow.Flow{"poll/vote_count": vote},
map[string]flow.Flow{
"poll/vote_count": vote,
"organization/vote_decrypt_public_main_key": vote2,
},
)

cache := cache.New(combined)
Expand Down
48 changes: 23 additions & 25 deletions internal/restrict/field_def.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion meta
Submodule meta updated 3 files
+1 −1 dev/requirements.txt
+0 −8 models.yml
+0 −1 search.yml
18 changes: 0 additions & 18 deletions pkg/datastore/dsfetch/fields_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading