From 2f2b301395897fa3460798f0e40c2584f1fdf4f1 Mon Sep 17 00:00:00 2001 From: Ganesh Gore Date: Tue, 8 Dec 2020 11:31:04 -0700 Subject: [PATCH] [Action] Updated repo destination --- .github/buildactionScripts.sh | 8 +-- .github/deploy_sofa.yaml | 20 +++++++- .github/workflows/deploy_qlsofa_hd.yaml | 14 +++--- .github/workflows/deploy_sofa_chd.yaml | 66 ------------------------- .github/workflows/deploy_sofa_hd.yaml | 8 +-- .github/workflows/sync_repo.sh | 4 ++ 6 files changed, 41 insertions(+), 79 deletions(-) delete mode 100644 .github/workflows/deploy_sofa_chd.yaml diff --git a/.github/buildactionScripts.sh b/.github/buildactionScripts.sh index 44b7362..af89217 100644 --- a/.github/buildactionScripts.sh +++ b/.github/buildactionScripts.sh @@ -6,13 +6,15 @@ SCAN_SOFA_CHD_KEY="FPGA1212_SOFA_CHD_PNR" SCAN_QLAP3_KEY="FPGA1212_QLAP3_PNR" # TODO: Strip comments while reading using yq -# TODO: Add QLAP3 for now -for repo in SOFA_HD SOFA_CHD QLSOFA_HD ; do +# TODO: Add SOFA_CHD and QLAP3 for later +for repo in SOFA_HD QLSOFA_HD ; do ScanDir=$(eval "echo \$SCAN_${repo}_KEY") action_filename=$(echo "$repo" | awk '{print tolower($0)}') - echo $ScanDir $action_filename + repo_name=$(echo "$repo" | sed "s/_/-/") + echo $ScanDir $action_filename $repo_name cat deploy_sofa.yaml | \ sed -e "s/SOFA_HD/${repo}/" \ + -e "s/SOFA-HD/${repo_name}/" \ -e "s/FPGA1212_FLAT_HD_SKY_PNR/${ScanDir}/" | \ yq r - -X > ./workflows/deploy_${action_filename}.yaml done \ No newline at end of file diff --git a/.github/deploy_sofa.yaml b/.github/deploy_sofa.yaml index 1825f26..3085575 100644 --- a/.github/deploy_sofa.yaml +++ b/.github/deploy_sofa.yaml @@ -14,7 +14,7 @@ env: PROJ_SUFFIX: &PROJ_SUFFIX SOFA_HD DEST_DIR: &DEST_DIR - Caravel-SOFA_HD + Caravel-SOFA-HD DEST_REPO: &DEST_REPO lnis-uofu/Caravel-SOFA-HD REPO_KEY: &REPO_KEY @@ -67,10 +67,12 @@ jobs: run: cd /usr/local/workspace && pwd && ls && bash ./SOFA-Chips/.github/workflows/perform_precheck.sh - name: Deploy files + # if: ${{ github.event_name == 'pull_request' && contains(github.ref, "master") && github.event.action == 'merged' }} run: bash ./SOFA-Chips/.github/workflows/sync_repo.sh - name: Deploy Changes uses: peaceiris/actions-gh-pages@v3 + # if: ${{ github.event_name == 'pull_request' && contains(github.ref, "master") && github.event.action == 'merged' }} with: user_name: "lnis.uofu" user_email: "lnis.uofu@gmail.com" @@ -80,3 +82,19 @@ jobs: publish_branch: master disable_nojekyll: true commit_message: '[Deployment] ${{ github.event.head_commit.message }}' + + # - name: Deploy files to localbranch + # if: ${{! (github.event_name == 'pull_request' && contains(github.ref, "master") && github.event.action == 'merged') }} + # run: bash ./SOFA-Chips/.github/workflows/sync_repo.sh + + # - name: Deploy Changes localbranch + # uses: peaceiris/actions-gh-pages@v3 + # if: ${{! (github.event_name == 'pull_request' && contains(github.ref, "master") && github.event.action == 'merged') }} + # with: + # user_name: "lnis.uofu" + # user_email: "lnis.uofu@gmail.com" + # github_token: ${{ secrets.GITHUB_TOKEN }} + # publish_dir: ./SOFA-Chips/local_checks/Caravel-SOFA_HD + # publish_branch: master + # disable_nojekyll: true + # commit_message: '[Deployment] ${{ github.event.head_commit.message }}' diff --git a/.github/workflows/deploy_qlsofa_hd.yaml b/.github/workflows/deploy_qlsofa_hd.yaml index 70ee007..a7db792 100644 --- a/.github/workflows/deploy_qlsofa_hd.yaml +++ b/.github/workflows/deploy_qlsofa_hd.yaml @@ -9,8 +9,8 @@ name: Caravel-QLSOFA_HD Deployment env: SCAN_DIRECTORY: 'FPGA1212_RESET_HD_SKY_PNR/**' PROJ_SUFFIX: QLSOFA_HD - DEST_DIR: Caravel-QLSOFA_HD - DEST_REPO: lnis-uofu/Caravel-SOFA-HD + DEST_DIR: Caravel-QLSOFA-HD + DEST_REPO: lnis-uofu/Caravel-QLSOFA-HD REPO_KEY: ${{ secrets.QLSOFA_HD_KEY }} on: push: @@ -36,8 +36,8 @@ jobs: - name: Checkout caravel repo uses: actions/checkout@master with: - repository: lnis-uofu/Caravel-SOFA-HD - path: Caravel-QLSOFA_HD + repository: lnis-uofu/Caravel-QLSOFA-HD + path: Caravel-QLSOFA-HD - name: Checkout open_mpw_precheck repo uses: actions/checkout@master with: @@ -52,15 +52,17 @@ jobs: run: cd /usr/local/workspace && pwd && ls && bash ./SOFA-Chips/.github/workflows/perform_precheck.sh - name: Deploy files + # if: ${{ github.event_name == 'pull_request' && contains(github.ref, "master") && github.event.action == 'merged' }} run: bash ./SOFA-Chips/.github/workflows/sync_repo.sh - name: Deploy Changes uses: peaceiris/actions-gh-pages@v3 + # if: ${{ github.event_name == 'pull_request' && contains(github.ref, "master") && github.event.action == 'merged' }} with: user_name: "lnis.uofu" user_email: "lnis.uofu@gmail.com" deploy_key: ${{ secrets.QLSOFA_HD_KEY }} - external_repository: lnis-uofu/Caravel-SOFA-HD - publish_dir: Caravel-QLSOFA_HD + external_repository: lnis-uofu/Caravel-QLSOFA-HD + publish_dir: Caravel-QLSOFA-HD publish_branch: master disable_nojekyll: true commit_message: '[Deployment] ${{ github.event.head_commit.message }}' diff --git a/.github/workflows/deploy_sofa_chd.yaml b/.github/workflows/deploy_sofa_chd.yaml deleted file mode 100644 index 63dc294..0000000 --- a/.github/workflows/deploy_sofa_chd.yaml +++ /dev/null @@ -1,66 +0,0 @@ -name: Caravel-SOFA_CHD Deployment -# = = = Env Variable = = = = = -# secrets.TEST_REPO_KEY -# secrets.SOFA_CHD_KEY -# secrets.SOFA_CHD_KEY -# secrets.QLSOFA_CHD_KEY -# secrets.QLAP3_KEY -# yq r -X deploy_sofa.yaml > ./workflows/deploy_sofa_hd.yaml -env: - SCAN_DIRECTORY: 'FPGA1212_SOFA_CHD_PNR/**' - PROJ_SUFFIX: SOFA_CHD - DEST_DIR: Caravel-SOFA_CHD - DEST_REPO: lnis-uofu/Caravel-SOFA-HD - REPO_KEY: ${{ secrets.SOFA_CHD_KEY }} -on: - push: - paths: - - '.github/**' - - 'SynRepoConfig/**' - - '$SCAN_DIRECTORY' - branches: - - ganesh_dev - pull_request: - types: closed - branches: - - master -jobs: - linux: - name: Updating release repository - runs-on: ubuntu-latest - steps: - - name: Checkout SOFA-Chips - uses: actions/checkout@v2 - with: - path: SOFA-Chips - - name: Checkout caravel repo - uses: actions/checkout@master - with: - repository: lnis-uofu/Caravel-SOFA-HD - path: Caravel-SOFA_CHD - - name: Checkout open_mpw_precheck repo - uses: actions/checkout@master - with: - repository: efabless/open_mpw_precheck - path: open_mpw_precheck - - name: Perform checks with open_mpw_precheck - uses: ganeshgore/docker-run-action@49cd3a1 - with: - image: goreganesh/open_mpw_prechecker - options: > - -v ${{github.workspace}}/open_mpw_precheck:/usr/local/bin -v ${{github.workspace}}:/usr/local/workspace -e DEST_DIR=$DEST_DIR -e SCAN_DIRECTORY=$SCAN_DIRECTORY --workdir /usr/local/workspace - - run: cd /usr/local/workspace && pwd && ls && bash ./SOFA-Chips/.github/workflows/perform_precheck.sh - - name: Deploy files - run: bash ./SOFA-Chips/.github/workflows/sync_repo.sh - - name: Deploy Changes - uses: peaceiris/actions-gh-pages@v3 - with: - user_name: "lnis.uofu" - user_email: "lnis.uofu@gmail.com" - deploy_key: ${{ secrets.SOFA_CHD_KEY }} - external_repository: lnis-uofu/Caravel-SOFA-HD - publish_dir: Caravel-SOFA_CHD - publish_branch: master - disable_nojekyll: true - commit_message: '[Deployment] ${{ github.event.head_commit.message }}' diff --git a/.github/workflows/deploy_sofa_hd.yaml b/.github/workflows/deploy_sofa_hd.yaml index 2c6f387..6d55b85 100644 --- a/.github/workflows/deploy_sofa_hd.yaml +++ b/.github/workflows/deploy_sofa_hd.yaml @@ -9,7 +9,7 @@ name: Caravel-SOFA_HD Deployment env: SCAN_DIRECTORY: 'FPGA1212_FLAT_HD_SKY_PNR/**' PROJ_SUFFIX: SOFA_HD - DEST_DIR: Caravel-SOFA_HD + DEST_DIR: Caravel-SOFA-HD DEST_REPO: lnis-uofu/Caravel-SOFA-HD REPO_KEY: ${{ secrets.SOFA_HD_KEY }} on: @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@master with: repository: lnis-uofu/Caravel-SOFA-HD - path: Caravel-SOFA_HD + path: Caravel-SOFA-HD - name: Checkout open_mpw_precheck repo uses: actions/checkout@master with: @@ -52,15 +52,17 @@ jobs: run: cd /usr/local/workspace && pwd && ls && bash ./SOFA-Chips/.github/workflows/perform_precheck.sh - name: Deploy files + # if: ${{ github.event_name == 'pull_request' && contains(github.ref, "master") && github.event.action == 'merged' }} run: bash ./SOFA-Chips/.github/workflows/sync_repo.sh - name: Deploy Changes uses: peaceiris/actions-gh-pages@v3 + # if: ${{ github.event_name == 'pull_request' && contains(github.ref, "master") && github.event.action == 'merged' }} with: user_name: "lnis.uofu" user_email: "lnis.uofu@gmail.com" deploy_key: ${{ secrets.SOFA_HD_KEY }} external_repository: lnis-uofu/Caravel-SOFA-HD - publish_dir: Caravel-SOFA_HD + publish_dir: Caravel-SOFA-HD publish_branch: master disable_nojekyll: true commit_message: '[Deployment] ${{ github.event.head_commit.message }}' diff --git a/.github/workflows/sync_repo.sh b/.github/workflows/sync_repo.sh index 1f3e365..c8e3218 100644 --- a/.github/workflows/sync_repo.sh +++ b/.github/workflows/sync_repo.sh @@ -17,3 +17,7 @@ cd ${DEST_DIR} sed -i -e "s/^/\n/" source_commit_hash.txt sed -i -e "s/^/${GITHUB_SHA}\n/" source_commit_hash.txt sed -i -e "s/^/$(date)\n/" source_commit_hash.txt + + +# Clean up file from repo +git checkout master qflow \ No newline at end of file