From 492bf5f6e7ebccb78bcbe3beb4dd582b1669bde4 Mon Sep 17 00:00:00 2001 From: Piyal Basu Date: Mon, 26 Jun 2023 17:37:17 -0400 Subject: [PATCH 1/7] add console --- extension/src/popup/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extension/src/popup/index.tsx b/extension/src/popup/index.tsx index dd4b325e5..35dbf2fd2 100755 --- a/extension/src/popup/index.tsx +++ b/extension/src/popup/index.tsx @@ -6,5 +6,7 @@ import "popup/helpers/localizationConfig"; // Import global CSS from Stellar Design System import "@stellar/design-system/build/styles.min.css"; +console.log("test"); + // eslint-disable-next-line react/jsx-filename-extension ReactDOM.render(, document.getElementById("root")); From a8212d1e37be647b35241f99160b63356f9efa05 Mon Sep 17 00:00:00 2001 From: Piyal Basu Date: Mon, 26 Jun 2023 19:40:03 -0400 Subject: [PATCH 2/7] try changing name to test --- .github/workflows/test.yml | 4 ++-- extension/src/popup/index.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cb5b4ddcc..ac9f0d851 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,7 +1,7 @@ -name: Test and build +name: test on: [pull_request] jobs: - build: + test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/extension/src/popup/index.tsx b/extension/src/popup/index.tsx index 35dbf2fd2..b710f5af8 100755 --- a/extension/src/popup/index.tsx +++ b/extension/src/popup/index.tsx @@ -6,7 +6,7 @@ import "popup/helpers/localizationConfig"; // Import global CSS from Stellar Design System import "@stellar/design-system/build/styles.min.css"; -console.log("test"); +console.log("tesst"); // eslint-disable-next-line react/jsx-filename-extension ReactDOM.render(, document.getElementById("root")); From abde0a4b1889ec0e232a778a37a8418bb37d2ba8 Mon Sep 17 00:00:00 2001 From: Piyal Basu Date: Mon, 26 Jun 2023 19:51:48 -0400 Subject: [PATCH 3/7] try adding a name to workflow --- .github/workflows/test.yml | 1 + extension/src/popup/index.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ac9f0d851..5ba67c842 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,6 +2,7 @@ name: test on: [pull_request] jobs: test: + name: test runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/extension/src/popup/index.tsx b/extension/src/popup/index.tsx index b710f5af8..35dbf2fd2 100755 --- a/extension/src/popup/index.tsx +++ b/extension/src/popup/index.tsx @@ -6,7 +6,7 @@ import "popup/helpers/localizationConfig"; // Import global CSS from Stellar Design System import "@stellar/design-system/build/styles.min.css"; -console.log("tesst"); +console.log("test"); // eslint-disable-next-line react/jsx-filename-extension ReactDOM.render(, document.getElementById("root")); From 7b0756fad38c9e7f0f88ddb1c5f9cfe2716427cb Mon Sep 17 00:00:00 2001 From: Piyal Basu Date: Tue, 27 Jun 2023 11:37:13 -0400 Subject: [PATCH 4/7] try commenting out competing workflows --- .github/workflows/buildPreview.yml | 104 ++++++++++++------------ .github/workflows/buildTranslations.yml | 68 ++++++++-------- .github/workflows/closePreview.yml | 30 +++---- .github/workflows/mergePreview.yml | 32 ++++---- extension/src/popup/index.tsx | 2 +- 5 files changed, 118 insertions(+), 118 deletions(-) diff --git a/.github/workflows/buildPreview.yml b/.github/workflows/buildPreview.yml index c5f518f5b..e8e64aacf 100644 --- a/.github/workflows/buildPreview.yml +++ b/.github/workflows/buildPreview.yml @@ -1,56 +1,56 @@ -name: Compile extension PR preview +# name: Compile extension PR preview -on: - pull_request: - paths: - - "extension/**/*" +# on: +# pull_request: +# paths: +# - "extension/**/*" -jobs: - compile: - runs-on: ubuntu-latest +# jobs: +# compile: +# runs-on: ubuntu-latest - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - name: Build extension - uses: actions/setup-node@v1 - with: - node-version: "16.14.0" - - run: yarn install && yarn build:extension-preview - - name: Zip extension build - uses: montudor/action-zip@v0.1.0 - with: - args: zip -qq -r ./extension/build/build.zip ./extension/build - - name: Delete Release # if it exists - uses: dev-drprasad/delete-tag-and-release@v0.2.1 - with: - delete_release: true - tag_name: pr-release-${{ github.event.number }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: pr-release-${{ github.event.number }} - release_name: PR Preview ${{ github.event.number }} - draft: false - prerelease: true - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: ./extension/build/build.zip - asset_name: build-pr-preview-${{ github.event.number }}.zip - asset_content_type: application/zip +# steps: +# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it +# - uses: actions/checkout@v2 +# - name: Build extension +# uses: actions/setup-node@v1 +# with: +# node-version: "16.14.0" +# - run: yarn install && yarn build:extension-preview +# - name: Zip extension build +# uses: montudor/action-zip@v0.1.0 +# with: +# args: zip -qq -r ./extension/build/build.zip ./extension/build +# - name: Delete Release # if it exists +# uses: dev-drprasad/delete-tag-and-release@v0.2.1 +# with: +# delete_release: true +# tag_name: pr-release-${{ github.event.number }} +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# - name: Create Release +# id: create_release +# uses: actions/create-release@v1 +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# with: +# tag_name: pr-release-${{ github.event.number }} +# release_name: PR Preview ${{ github.event.number }} +# draft: false +# prerelease: true +# - name: Upload Release Asset +# id: upload-release-asset +# uses: actions/upload-release-asset@v1 +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# with: +# upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps +# asset_path: ./extension/build/build.zip +# asset_name: build-pr-preview-${{ github.event.number }}.zip +# asset_content_type: application/zip - - name: Comment PR - uses: thollander/actions-comment-pull-request@v1 - with: - message: Preview build at https://github.com/${{ github.repository }}/releases/download/pr-release-${{ github.event.number }}/build-pr-preview-${{ github.event.number }}.zip - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# - name: Comment PR +# uses: thollander/actions-comment-pull-request@v1 +# with: +# message: Preview build at https://github.com/${{ github.repository }}/releases/download/pr-release-${{ github.event.number }}/build-pr-preview-${{ github.event.number }}.zip +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/buildTranslations.yml b/.github/workflows/buildTranslations.yml index 12de5648e..270b62c98 100644 --- a/.github/workflows/buildTranslations.yml +++ b/.github/workflows/buildTranslations.yml @@ -1,36 +1,36 @@ -name: Build translations +# name: Build translations -on: - pull_request: - paths: - - "extension/**/*" +# on: +# pull_request: +# paths: +# - "extension/**/*" -jobs: - translate: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - persist-credentials: false - fetch-depth: 0 - - uses: actions/setup-node@v1 - with: - node-version: "16.14.0" - - name: Run translation job - run: | - yarn && yarn build:freighter-api && yarn build:extension:translations - - name: Verify diff - id: verify_diff - run: | - git diff --quiet || echo "::set-output name=new_translations_exist::true" - - name: Commit files - if: steps.verify_diff.outputs.new_translations_exist == 'true' - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - git commit -m "Add translations" -a - - name: Push changes - uses: ad-m/github-push-action@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branch: ${{ github.head_ref }} +# jobs: +# translate: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2 +# with: +# persist-credentials: false +# fetch-depth: 0 +# - uses: actions/setup-node@v1 +# with: +# node-version: "16.14.0" +# - name: Run translation job +# run: | +# yarn && yarn build:freighter-api && yarn build:extension:translations +# - name: Verify diff +# id: verify_diff +# run: | +# git diff --quiet || echo "::set-output name=new_translations_exist::true" +# - name: Commit files +# if: steps.verify_diff.outputs.new_translations_exist == 'true' +# run: | +# git config --local user.email "action@github.com" +# git config --local user.name "GitHub Action" +# git commit -m "Add translations" -a +# - name: Push changes +# uses: ad-m/github-push-action@master +# with: +# github_token: ${{ secrets.GITHUB_TOKEN }} +# branch: ${{ github.head_ref }} diff --git a/.github/workflows/closePreview.yml b/.github/workflows/closePreview.yml index eacfca8d7..0b7deb0d7 100644 --- a/.github/workflows/closePreview.yml +++ b/.github/workflows/closePreview.yml @@ -1,18 +1,18 @@ -name: Cleanup extension PR preview on close +# name: Cleanup extension PR preview on close -on: - pull_request: - types: [closed] +# on: +# pull_request: +# types: [closed] -jobs: - close: - runs-on: ubuntu-latest +# jobs: +# close: +# runs-on: ubuntu-latest - steps: - - name: Delete Release - uses: dev-drprasad/delete-tag-and-release@v0.2.1 - with: - delete_release: true - tag_name: pr-release-${{ github.event.number }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# steps: +# - name: Delete Release +# uses: dev-drprasad/delete-tag-and-release@v0.2.1 +# with: +# delete_release: true +# tag_name: pr-release-${{ github.event.number }} +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/mergePreview.yml b/.github/workflows/mergePreview.yml index 4df6da152..188b7ccdf 100644 --- a/.github/workflows/mergePreview.yml +++ b/.github/workflows/mergePreview.yml @@ -1,19 +1,19 @@ -name: Cleanup extension PR preview on merge +# name: Cleanup extension PR preview on merge -on: - push: - branches: - - master +# on: +# push: +# branches: +# - master -jobs: - merge: - runs-on: ubuntu-latest +# jobs: +# merge: +# runs-on: ubuntu-latest - steps: - - name: Delete Release - uses: dev-drprasad/delete-tag-and-release@v0.2.1 - with: - delete_release: true - tag_name: pr-release-${{ github.event.number }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# steps: +# - name: Delete Release +# uses: dev-drprasad/delete-tag-and-release@v0.2.1 +# with: +# delete_release: true +# tag_name: pr-release-${{ github.event.number }} +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/extension/src/popup/index.tsx b/extension/src/popup/index.tsx index 35dbf2fd2..b710f5af8 100755 --- a/extension/src/popup/index.tsx +++ b/extension/src/popup/index.tsx @@ -6,7 +6,7 @@ import "popup/helpers/localizationConfig"; // Import global CSS from Stellar Design System import "@stellar/design-system/build/styles.min.css"; -console.log("test"); +console.log("tesst"); // eslint-disable-next-line react/jsx-filename-extension ReactDOM.render(, document.getElementById("root")); From d0e481742ea3046b1990c9eed2069e1c45f70e2c Mon Sep 17 00:00:00 2001 From: Piyal Basu Date: Tue, 27 Jun 2023 11:51:01 -0400 Subject: [PATCH 5/7] re-enable translations --- .github/workflows/buildTranslations.yml | 68 ++++++++++++------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/buildTranslations.yml b/.github/workflows/buildTranslations.yml index 270b62c98..12de5648e 100644 --- a/.github/workflows/buildTranslations.yml +++ b/.github/workflows/buildTranslations.yml @@ -1,36 +1,36 @@ -# name: Build translations +name: Build translations -# on: -# pull_request: -# paths: -# - "extension/**/*" +on: + pull_request: + paths: + - "extension/**/*" -# jobs: -# translate: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2 -# with: -# persist-credentials: false -# fetch-depth: 0 -# - uses: actions/setup-node@v1 -# with: -# node-version: "16.14.0" -# - name: Run translation job -# run: | -# yarn && yarn build:freighter-api && yarn build:extension:translations -# - name: Verify diff -# id: verify_diff -# run: | -# git diff --quiet || echo "::set-output name=new_translations_exist::true" -# - name: Commit files -# if: steps.verify_diff.outputs.new_translations_exist == 'true' -# run: | -# git config --local user.email "action@github.com" -# git config --local user.name "GitHub Action" -# git commit -m "Add translations" -a -# - name: Push changes -# uses: ad-m/github-push-action@master -# with: -# github_token: ${{ secrets.GITHUB_TOKEN }} -# branch: ${{ github.head_ref }} +jobs: + translate: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + persist-credentials: false + fetch-depth: 0 + - uses: actions/setup-node@v1 + with: + node-version: "16.14.0" + - name: Run translation job + run: | + yarn && yarn build:freighter-api && yarn build:extension:translations + - name: Verify diff + id: verify_diff + run: | + git diff --quiet || echo "::set-output name=new_translations_exist::true" + - name: Commit files + if: steps.verify_diff.outputs.new_translations_exist == 'true' + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + git commit -m "Add translations" -a + - name: Push changes + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branch: ${{ github.head_ref }} From c12d94ef39528bbfd16ff5dd6223f35e40283356 Mon Sep 17 00:00:00 2001 From: Piyal Basu Date: Tue, 27 Jun 2023 11:58:43 -0400 Subject: [PATCH 6/7] try combining the jobs --- .github/workflows/buildTranslations.yml | 2 ++ .github/workflows/test.yml | 28 ++++++++++++------------- extension/src/popup/index.tsx | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/buildTranslations.yml b/.github/workflows/buildTranslations.yml index 12de5648e..4cf801b10 100644 --- a/.github/workflows/buildTranslations.yml +++ b/.github/workflows/buildTranslations.yml @@ -34,3 +34,5 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} branch: ${{ github.head_ref }} + - name: test + run: yarn test:ci diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5ba67c842..baa0bf4f8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,14 +1,14 @@ -name: test -on: [pull_request] -jobs: - test: - name: test - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: 16.14.0 - - run: yarn install - - run: yarn build - - run: yarn test:ci +# name: test +# on: [pull_request] +# jobs: +# test: +# name: test +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2 +# - uses: actions/setup-node@v2 +# with: +# node-version: 16.14.0 +# - run: yarn install +# - run: yarn build +# - run: yarn test:ci diff --git a/extension/src/popup/index.tsx b/extension/src/popup/index.tsx index b710f5af8..35dbf2fd2 100755 --- a/extension/src/popup/index.tsx +++ b/extension/src/popup/index.tsx @@ -6,7 +6,7 @@ import "popup/helpers/localizationConfig"; // Import global CSS from Stellar Design System import "@stellar/design-system/build/styles.min.css"; -console.log("tesst"); +console.log("test"); // eslint-disable-next-line react/jsx-filename-extension ReactDOM.render(, document.getElementById("root")); From 6156a4d3ea6c08b9ecaad5cef73e015f486a4d73 Mon Sep 17 00:00:00 2001 From: Piyal Basu Date: Tue, 27 Jun 2023 12:05:39 -0400 Subject: [PATCH 7/7] try renaming job --- .github/workflows/buildTranslations.yml | 2 +- extension/src/popup/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildTranslations.yml b/.github/workflows/buildTranslations.yml index 4cf801b10..33e983019 100644 --- a/.github/workflows/buildTranslations.yml +++ b/.github/workflows/buildTranslations.yml @@ -6,7 +6,7 @@ on: - "extension/**/*" jobs: - translate: + test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/extension/src/popup/index.tsx b/extension/src/popup/index.tsx index 35dbf2fd2..b710f5af8 100755 --- a/extension/src/popup/index.tsx +++ b/extension/src/popup/index.tsx @@ -6,7 +6,7 @@ import "popup/helpers/localizationConfig"; // Import global CSS from Stellar Design System import "@stellar/design-system/build/styles.min.css"; -console.log("test"); +console.log("tesst"); // eslint-disable-next-line react/jsx-filename-extension ReactDOM.render(, document.getElementById("root"));