-
Notifications
You must be signed in to change notification settings - Fork 593
Unstable alignment #495
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
Open
dariaguy
wants to merge
258
commits into
unstable
Choose a base branch
from
unstable-alignment
base: unstable
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Unstable alignment #495
Changes from all commits
Commits
Show all changes
258 commits
Select commit
Hold shift + click to select a range
5459e30
Release 8.2.0
Peter-Sh e19e964
Merge remote-tracking branch 'origin/release/8.2' into release/8.2
Peter-Sh a13b788
Bump Redis version to 8.2.1 (#469)
adamiBs bb9ce95
First branch manipulation implementation
Peter-Sh bced1da
Fix workflow
Peter-Sh 36d63fc
Fix yaml
Peter-Sh 6d12d22
Fix path to actions
Peter-Sh d067295
Fix push empty branches
Peter-Sh b82ea9d
Use different runner
Peter-Sh 32823d7
Pretty output
Peter-Sh efe9b17
Fix execut command
Peter-Sh 68817c7
Use common base
Peter-Sh 3041ccd
Add validate archive action
Peter-Sh 5637a31
Make executable
Peter-Sh c17467a
Make curl return error
Peter-Sh 1d00759
Make curl silent
Peter-Sh a86989c
Try to use pre-merge.yml
Peter-Sh 5f6fccc
allow-modify flag
Peter-Sh 8e1e9ad
Fix workflow
Peter-Sh b981b62
Fix worflow reuse
Peter-Sh 0786970
Fixed required property type
Peter-Sh d7507d3
Remove runs-on
Peter-Sh d3d5043
Add apply-docker-version
Peter-Sh 21faa0e
Use explicit branch name
Peter-Sh 8805777
Branches doesn't work with local versions
Peter-Sh 3a85e67
Add bot name
Peter-Sh 2262399
Try locl config
Peter-Sh cc1dd2a
Use --author
Peter-Sh 0a7159a
debug output
Peter-Sh d158d12
Auto merge from release branch
Peter-Sh a75454e
Push after merge, use helpers
Peter-Sh f769966
debug output
Peter-Sh 9be223f
Try to use --unshallow
Peter-Sh 49e3112
Try to combine unshallow and not unshallow
Peter-Sh c7b84a2
Use function to fetch unshallow
Peter-Sh dec5f36
Set author for merge
Peter-Sh 4e05f49
Fix sha calculation
Peter-Sh e86576d
Fix ensure branch call when building
Peter-Sh 0174082
Fix ensure branch call when building
Peter-Sh 8ea64de
Try to create verified commit
Peter-Sh 4bb6e39
Push to release_version_branch instead of release_branch
Peter-Sh 0fda96a
Optional workflow_uuid
Peter-Sh ab10d32
Use run-name
Peter-Sh 8f8e26b
Fix double space
Peter-Sh 87e8b82
Use ghcr.io to push images
Peter-Sh c3dcc3e
Enable build again for testing
Peter-Sh d5c2133
Try to fix ghcr.io tag
Peter-Sh 81b938a
Fix release_tag propagation
Peter-Sh e21a84d
Fix unexpected end of expression
Peter-Sh f26e8ea
registry tags must be lowercase
Peter-Sh 7db9d66
Step to correctly format registry tag
Peter-Sh 507d27a
Remove unsupported toLower()
Peter-Sh 5276cb9
Fix step shell
Peter-Sh be7d642
Try verified merge
Peter-Sh f6de3ed
Fix heredoc
Peter-Sh b645ce4
Show commits
Peter-Sh baf14b2
Debug
Peter-Sh af2fa70
debg
Peter-Sh bcb994b
Format oneline
Peter-Sh 52f21d9
Remove heredoc
Peter-Sh 04d4b10
debug3
Peter-Sh 0dd9300
debug 4
Peter-Sh debc6a1
debyg 5
Peter-Sh 3d5e032
Add GITHUB_TOKEN
Peter-Sh a9e5e25
Pass gh_token
Peter-Sh e708852
debug 6
Peter-Sh c266e09
fix tkn
Peter-Sh 4ddc546
debug 7
Peter-Sh 1b671ac
remove set -x
Peter-Sh 8658fa6
Moved verfied merge into function
Peter-Sh 89d5e41
Just a change
Peter-Sh 3a29c1b
Fix arguments parsing
Peter-Sh f9bedc1
Add second shift
Peter-Sh 71a6362
Fix docker files updating
Peter-Sh 4e317e6
Test modification
Peter-Sh 5aa2d5d
Merge back
Peter-Sh c4121f6
Enable build
Peter-Sh d54f8ac
Set execute bit
Peter-Sh ee242c2
Add debug
Peter-Sh 3e47704
Skip build for debug
Peter-Sh bda1955
Disable fail on error
Peter-Sh b6d53ec
Further debug
Peter-Sh 28f1281
Fix merge function and add gh token
Peter-Sh f6bbb64
Fix env
Peter-Sh 970c2aa
Move reusable actions to redis-oss-release-automation
Peter-Sh 707d66b
Fix actions refs
Peter-Sh 5d1810f
Remove actions that were transerred to release automation
Peter-Sh 68bfae0
Return commented out actions
Peter-Sh 51910ee
Use common from another repo
Peter-Sh 9b9253d
Fix remote action usage instead of local
Peter-Sh 59788b3
Test merge back without changed files
Peter-Sh d3f4cb6
Return full build
Peter-Sh a531b37
Prepare stackbrew librirary intermediate commit
Peter-Sh f6b02de
Support for EOLing versions, fixes and update tests
Peter-Sh 59566b2
Comments and fixes to the shell version
Peter-Sh bbd49d2
Python release-automation implementation
Peter-Sh c06c345
Triggering workflow
Peter-Sh 672c2ae
Fix trigger
Peter-Sh f5d5d0c
Docker for releasr-automation
Peter-Sh 1501da1
Test release-automation docker
Peter-Sh 13648c5
Fix image url
Peter-Sh 3c5896d
Test remote names
Peter-Sh 5b2eb4c
fix
Peter-Sh ee0636f
fix add to safe directory
Peter-Sh 555d124
Debug output
Peter-Sh de932b0
Continue debugging
Peter-Sh a7a9434
Remove env to test
Peter-Sh 7b91991
Removed safe dir
Peter-Sh ee98238
debug outpu
Peter-Sh 11fced5
Debug output
Peter-Sh abada29
Add global safe dir and run tests
Peter-Sh e5cc7b3
Fix docker image
Peter-Sh 50884e5
Try to fix workspace
Peter-Sh 35c8bc8
cd to release-automation for testing
Peter-Sh 7a430bd
Comment
Peter-Sh f4f91bc
Full stackbrew format support
Peter-Sh c140a5b
Try interactive mode
Peter-Sh 45aa7b1
Use only -i
Peter-Sh 688c2c3
Try force color
Peter-Sh 1b9bf32
Readme
Peter-Sh 77a5c18
Refactoring the code
Peter-Sh 316f0c4
Temporary disable the build, test tag creation
Peter-Sh 4c0e470
Create tag only if merge was done
Peter-Sh 9faae5f
Debug output
Peter-Sh 0631deb
lilbit dbg
Peter-Sh c817116
fix dblquoute
Peter-Sh 9d6435d
Remove debug
Peter-Sh c626c11
Release handle
Peter-Sh 256448c
Rename release_handle
Peter-Sh 8ccb38d
Release publish first run
Peter-Sh 9ab8c8e
Fix push condition
Peter-Sh 2613793
Fix yaml for release_publish workflow
Peter-Sh 3e6e240
Remove push run
Peter-Sh eb29459
Creating a PR: first attempt
Peter-Sh 2291fee
Fix official images url
Peter-Sh fd6c12f
Fix update-stackbrew-file args
Peter-Sh 7579472
Swap remotes
Peter-Sh 480669b
Use token for fork
Peter-Sh 8654ea2
Show color diff
Peter-Sh f33f94a
Add generated output entries
Peter-Sh 4faa3a4
Upload release_info
Peter-Sh 7f38f4e
Increase artifact lifetime, remove unused yaml
Peter-Sh e7d4b01
Use redis-developer fork, but target personal repo for testing
Peter-Sh d2af09d
Use personal token for PR
Peter-Sh 800abcb
Fix fork url
Peter-Sh 2de5de1
Add a DRAFT note
Peter-Sh 333a41b
Try syncing fork and pushing to master
Peter-Sh 061bc6b
Revert "Try syncing fork and pushing to master"
Peter-Sh ad3f9b2
Use official docker for testing
Peter-Sh 35a3180
Collect image urls to release handle
Peter-Sh 9c2abfe
Return to personal repo for testing
Peter-Sh ab49c2b
Temporary disable some of the architectures
Peter-Sh 688f959
Leave only 2 images
Peter-Sh b997ae6
Try self-hosted runners
Peter-Sh a7deb84
Fix image urls
Peter-Sh c5fa85d
Used scoped layer cache
Peter-Sh a3a372b
Introduce wait for redis instead of always sleep
Peter-Sh f5d5e90
Increase timeout
Peter-Sh 9536d72
Really increase timeout
Peter-Sh 47d5c1b
Fix wait for redis: use correct container id
Peter-Sh c61a6ea
Return official images for demo
Peter-Sh 5a34e94
Add slack notification about image urls
Peter-Sh af9ca7f
Revert "Return official images for demo"
Peter-Sh c51ce0d
Reformat slack message
Peter-Sh 18673cc
Slack msg for PR creation
Peter-Sh 13bacc0
Debug output
Peter-Sh b4675ca
Further debug
Peter-Sh 5db0864
Try using GITHUB_WORKSPACE env
Peter-Sh fa7c8eb
Use checkout action
Peter-Sh 26177ae
Fix curl execution for slack
Peter-Sh fa6360b
Use official repo
Peter-Sh 164c124
Proper milestone filtering and tests
Peter-Sh 3468cec
Fix slack footer, return personal target
Peter-Sh f9da1d4
Fix sort in eol filter, update tests
Peter-Sh d44b5ea
Change slack msg format for images list
Peter-Sh 7757470
Add mentions and link to changes
Peter-Sh 86b550b
New icon, move user mentions to env
Peter-Sh 800e079
Fix icon and url
Peter-Sh eedc99d
Test failure
Peter-Sh 8a2aeb0
Fix failure message failure
Peter-Sh 67a485b
Remove bash stackbrew implementation
Peter-Sh c420598
Test build failure notification
Peter-Sh e172434
Checkout code for failure notification
Peter-Sh faa5f5b
Fix tag in build failure message
Peter-Sh 9593d64
Return debian/Dockerfile to original state
Peter-Sh 67d28c7
Removed failure test
Peter-Sh 7672ccc
Align with redis/docker-library-redis
Peter-Sh dc3a92d
Gitignore for release-automation
Peter-Sh 326142f
Removed draft warning and returned official target and user mentions
Peter-Sh 03cfe48
Comment out duplicate variables
Peter-Sh 8a94c07
Fix url for redis-oss-release-automation
Peter-Sh 88c4970
Merge pull request #474 from Peter-Sh/release/8.2
Peter-Sh 858051c
8.2.2-int
github-actions[bot] 368fbcf
Merge 8.2.2-int into release/8.2 (bot)
github-actions[bot] a6f75de
Fixed regexp in notification
Peter-Sh 4bdebef
Merge release/8.2 into 8.2.2-int (bot)
github-actions[bot] e0ea188
Merge 8.2.2-int into release/8.2 (bot)
github-actions[bot] 179323b
8.4-m01-int
github-actions[bot] 6c5502d
Merge 8.4-m01-int into release/8.4 (bot)
github-actions[bot] ef4470e
Do not push to official library by default
Peter-Sh be54e5f
Fix publish image in pre-merge workflow
Peter-Sh 170c204
Fix pr_to_official condition
Peter-Sh 08ae191
Use actual repo (peeled) commits instead of annotated tag hashes
Peter-Sh c8886b7
Merge pull request #481 from redis/fix_git_ls_remote_8.4
Peter-Sh d0a18a5
8.4-rc1-int
github-actions[bot] 6303a78
Merge 8.4-rc1-int into release/8.4 (bot)
github-actions[bot] f34d7f6
Fix image URL collection
Peter-Sh 41e6196
Merge release/8.4 into 8.4-rc1-int (bot)
github-actions[bot] 78e995a
Fix heredoc syntax
Peter-Sh 24872c4
Merge release/8.4 into 8.4-rc1-int (bot)
github-actions[bot] 59647ca
Merge 8.4-rc1-int into release/8.4 (bot)
github-actions[bot] b165dab
Rename release_handle.json to result.json
Peter-Sh 1d653ea
Merge release/8.4 into 8.4-rc1-int (bot)
github-actions[bot] a0d213b
Merge 8.4-rc1-int into release/8.4 (bot)
github-actions[bot] a2bacd7
Fix publish workflow to use standard result.json in result_info artifact
Peter-Sh 08c6ad1
8.4-rc1-int2
github-actions[bot] 920a74f
Merge 8.4-rc1-int2 into release/8.4 (bot)
github-actions[bot] 80e2443
8.4-rc1
github-actions[bot] 9524747
Merge 8.4-rc1 into release/8.4 (bot)
github-actions[bot] 47386b7
Add release_tag input for compatibility
Peter-Sh 8ed61e0
Update assert_redis_v8 to accept both Redis v=8 and v=255
adobrzhansky 0fc2f88
8.4-int
github-actions[bot] e4bcc76
Merge 8.4-int into release/8.4 (bot)
github-actions[bot] c9a48e2
8.4-int2
github-actions[bot] debf3da
Merge 8.4-int2 into release/8.4 (bot)
github-actions[bot] fb3a390
8.4-int3
github-actions[bot] 4ba3e19
Merge 8.4-int3 into release/8.4 (bot)
github-actions[bot] e6740a2
8.4.0
github-actions[bot] de8bb5f
Merge 8.4.0 into release/8.4 (bot)
github-actions[bot] 083c9af
Use uv and lock versions
Peter-Sh e2ead16
Fix stackbrew generation when 8.X and 8.X.Y formats are mixed toghether
Peter-Sh f956eda
Update test run to use uv
Peter-Sh 96ac2d9
Fix tests
Peter-Sh 825351f
Merge pull request #491 from redis/fix_stackbrew_generation
Peter-Sh ec9d20f
Updates Debian base image to Trixie (#494)
adobrzhansky 154759d
Merge remote-tracking branch 'origin/release/8.4' into unstable-align…
dariaguy 97f5af0
Add build args, custom_build and test workflows
dariaguy dcafdb9
Added branch reference in test-nightly-unstable
dariaguy 41a42ec
Use pre-merge workflow in unstable-alignment
dariaguy 4589bcc
Fixed Redis archive script for custom_build
dariaguy 4f8d555
Fixed build-push-action build-args
dariaguy e03d68e
Fix CUSTOM_BUILD if syntax in Dockerfile
dariaguy 8942cdd
Use double quotes in modules version sed
dariaguy dcdacbe
Change tag prefix and enable pushing images
dariaguy d124b37
Fix create-image-labels action
dariaguy 7da85b8
Added run_type input
dariaguy 7f3b056
Synced test and release-automation with release/8.4
dariaguy 4a68482
Remove cache in docker build for non-release
dariaguy 0492bba
Added pull-request workflows
dariaguy 6305b17
Run format-registry-tag step if required
dariaguy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,36 @@ | ||
| inputs: | ||
| release_tag: | ||
| description: 'Release tag to build' | ||
| required: true | ||
| release_version_branch: | ||
| description: 'Release version branch to commit to' | ||
| required: true | ||
|
|
||
| outputs: | ||
| changed_files: | ||
| description: 'List of files that were modified' | ||
| value: ${{ steps.apply-version.outputs.changed_files }} | ||
|
|
||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: Checkout common functions | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| repository: redis-developer/redis-oss-release-automation | ||
| ref: main | ||
| path: redis-oss-release-automation | ||
|
|
||
| - name: Apply docker version | ||
| id: apply-version | ||
| shell: bash | ||
| run: | | ||
| ${{ github.action_path }}/apply-docker-version.sh ${{ inputs.release_tag }} | ||
|
|
||
| - name: Create verified commit | ||
| if: steps.apply-version.outputs.changed_files != '' | ||
| uses: iarekylew00t/verified-bot-commit@v1 | ||
| with: | ||
| message: ${{ inputs.release_tag }} | ||
| files: ${{ steps.apply-version.outputs.changed_files }} | ||
| ref: ${{ inputs.release_version_branch }} | ||
104 changes: 104 additions & 0 deletions
104
.github/actions/apply-docker-version/apply-docker-version.sh
This file contains hidden or 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,104 @@ | ||
| #!/bin/bash | ||
| set -e | ||
|
|
||
| # This script updates Redis version in Dockerfiles using environment variables | ||
| # REDIS_ARCHIVE_URL and REDIS_ARCHIVE_SHA, then commits changes if any were made. | ||
|
|
||
| # shellcheck disable=SC2034 | ||
| last_cmd_stdout="" | ||
| # shellcheck disable=SC2034 | ||
| last_cmd_stderr="" | ||
| # shellcheck disable=SC2034 | ||
| last_cmd_result=0 | ||
| # shellcheck disable=SC2034 | ||
| VERBOSITY=1 | ||
|
|
||
|
|
||
|
|
||
| SCRIPT_DIR="$(dirname -- "$( readlink -f -- "$0"; )")" | ||
| # shellcheck disable=SC1091 | ||
| . "$SCRIPT_DIR/../common/func.sh" | ||
|
|
||
| source_helper_file helpers.sh | ||
|
|
||
| # Input TAG is expected in $1 | ||
| TAG="$1" | ||
|
|
||
| if [ -z "$TAG" ]; then | ||
| echo "Error: TAG is required as first argument" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Check if required environment variables are set | ||
| if [ -z "$REDIS_ARCHIVE_URL" ]; then | ||
| echo "Error: REDIS_ARCHIVE_URL environment variable is not set" | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [ -z "$REDIS_ARCHIVE_SHA" ]; then | ||
| echo "Error: REDIS_ARCHIVE_SHA environment variable is not set" | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "TAG: $TAG" | ||
| echo "REDIS_ARCHIVE_URL: $REDIS_ARCHIVE_URL" | ||
| echo "REDIS_ARCHIVE_SHA: $REDIS_ARCHIVE_SHA" | ||
|
|
||
| # Function to update Dockerfile | ||
| update_dockerfile() { | ||
| local dockerfile="$1" | ||
| local updated=false | ||
|
|
||
| if [ ! -f "$dockerfile" ]; then | ||
| echo "Warning: $dockerfile not found, skipping" | ||
| return 1 | ||
| fi | ||
|
|
||
| echo "Updating $dockerfile..." | ||
|
|
||
| # Update REDIS_DOWNLOAD_URL | ||
| if grep -q "^ARG REDIS_DOWNLOAD_URL=" "$dockerfile"; then | ||
| sed -i "s|^ARG REDIS_DOWNLOAD_URL=.*|ARG REDIS_DOWNLOAD_URL=$REDIS_ARCHIVE_URL|" "$dockerfile" | ||
| else | ||
| echo "Cannot update $dockerfile, ARG REDIS_DOWNLOAD_URL not found" | ||
| return 1 | ||
| fi | ||
|
|
||
|
|
||
| # Update REDIS_DOWNLOAD_SHA | ||
| if grep -q "^ARG REDIS_DOWNLOAD_SHA=" "$dockerfile"; then | ||
| sed -i "s|^ARG REDIS_DOWNLOAD_SHA=.*|ARG REDIS_DOWNLOAD_SHA=$REDIS_ARCHIVE_SHA|" "$dockerfile" | ||
| else | ||
| echo "Cannot update $dockerfile, ARG REDIS_DOWNLOAD_SHA not found" | ||
| return 1 | ||
| fi | ||
| } | ||
|
|
||
| docker_files=("debian/Dockerfile" "alpine/Dockerfile") | ||
| # Track which files were modified | ||
| changed_files=() | ||
|
|
||
| for dockerfile in "${docker_files[@]}"; do | ||
| update_dockerfile "$dockerfile" | ||
| done | ||
|
|
||
| changed_files=($(git diff --name-only "${docker_files[@]}")) | ||
|
|
||
| # Output the list of changed files for GitHub Actions | ||
| if [ ${#changed_files[@]} -gt 0 ]; then | ||
| echo "Files were modified:" | ||
| printf '%s\n' "${changed_files[@]}" | ||
|
|
||
| # Set GitHub Actions output | ||
| changed_files_output=$(printf '%s\n' "${changed_files[@]}") | ||
| { | ||
| echo "changed_files<<EOF" | ||
| echo "$changed_files_output" | ||
| echo "EOF" | ||
| } >> "$GITHUB_OUTPUT" | ||
|
|
||
| echo "Changed files output set for next step" | ||
| else | ||
| echo "No files were modified" | ||
| echo "changed_files=" >> "$GITHUB_OUTPUT" | ||
| fi |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.