From 9acda3aed386c5b521b5aeea491ce7d8dfa38f31 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Sat, 9 Mar 2024 15:07:45 +0100 Subject: [PATCH] #474 Put some files under source control --- .github/workflows/build-images.yaml | 47 +++++++++++++++++++++++++++++ tools/under-control/Dockerfile | 12 ++++++++ tools/under-control/get_files.sh | 20 ++++++++++-- 3 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 tools/under-control/Dockerfile diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml index 3b199af3..5d28e03b 100644 --- a/.github/workflows/build-images.yaml +++ b/.github/workflows/build-images.yaml @@ -119,6 +119,53 @@ jobs: fi fi + - name: Update files under control + shell: bash + run: | + cd cromite + RELEASE=$(cat build/RELEASE) + + cd cromite/tools/under-control + test -f src/RELEASE || mkdir -p src && echo . >src/RELEASE + + DO_UPDATE=0 + if [ -n "$NEW_VERSION" ]; then + if [ "$RELEASE" != "$NEW_VERSION" ]; then + DO_UPDATE=1 + fi + + elif [ "$RELEASE" != $(CAT src/RELEASE)" ]; then + DO_UPDATE=1 + NEW_VERSION=$RELEASE + fi + + if [[ DO_UPDATE -eq 1 ]]; then + test -d src && rm -rf src + docker build --no-cache --progress=plain -o . . + echo $NEW_VERSION >src/RELEASE + fi + + CHANGES=0 && git diff --quiet || CHANGES=1 + echo "CHANGES=$CHANGES" >> $GITHUB_ENV + if [[ CHANGES -eq 1 ]]; then + git add src + git diff --name-only --staged + fi + + - name: Create Pull Request + uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a #v3.12.0 + if: env.CHANGES == '1' + with: + token: ${{ secrets.CROMITE_PULLS }} + path: cromite + add-paths: | + tools/under-control/* + commit-message: 'AUTOMATED - new files under control' + title: New files under control ${{ env.NEW_VERSION }} + body: ${{ env.MESSAGE }} + delete-branch: true + branch-suffix: short-commit-hash + - name: Create issue ${{ env.VERSION }} if: "${{ env.NEW_VERSION != '' }}" shell: bash diff --git a/tools/under-control/Dockerfile b/tools/under-control/Dockerfile new file mode 100644 index 00000000..895d1542 --- /dev/null +++ b/tools/under-control/Dockerfile @@ -0,0 +1,12 @@ +FROM uazo/chromium:122.0.6261.111 AS source + +ENV CHR_SOURCE_DIR=/home/lg/working_dir/chromium/src/ +ENV OUTPUT_DIR=/home/lg/working_dir/out/ +ENV FILE_LIST=/home/lg/working_dir/file_list.txt + +COPY get_files.sh . +COPY file_list.txt . +RUN bash get_files.sh + +FROM scratch AS export-stage +COPY --from=source /home/lg/working_dir/out/ ./src/ diff --git a/tools/under-control/get_files.sh b/tools/under-control/get_files.sh index c4c58dd4..d2874990 100644 --- a/tools/under-control/get_files.sh +++ b/tools/under-control/get_files.sh @@ -1,15 +1,30 @@ #!/bin/bash -FILE_LIST=~/cromite/tools/under-control/file_list.txt -OUTPUT_DIR=~/cromite/tools/under-control/src/ +# FILE_LIST=/home/lg/working_dir/file_list.txt +# OUTPUT_DIR=~/cromite/tools/under-control/src/ if [ -z "$CHR_SOURCE_DIR" ]; then echo "CHR_SOURCE_DIR is empty" exit 1 fi +if [ -z "$OUTPUT_DIR" ]; then + echo "OUTPUT_DIR is empty" + exit 1 +fi + +if [ -z "$FILE_LIST" ]; then + echo "FILE_LIST is empty" + exit 1 +fi + +mkdir -p $OUTPUT_DIR + pushd $CHR_SOURCE_DIR > /dev/null +echo Getting files +cat $FILE_LIST + cat $FILE_LIST | while read current_file do if [[ $current_file =~ ^#.* ]]; then @@ -36,5 +51,4 @@ do done -cp ~/cromite/build/RELEASE $OUTPUT_DIR popd > /dev/null