From 4f0ee36d53ccc681eabfa67876ad9ef9c1eb7b5d Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 10 Nov 2022 13:09:26 +0800 Subject: [PATCH 1/9] Update release-macos.yml --- .github/workflows/release-macos.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 2ca70bc0..12a5fca3 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -20,11 +20,10 @@ jobs: - name: Install coscmd run: | sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/python -m pip install --upgrade pip - sudo pip install coscmd + sudo pip3 install coscmd echo $PATH find /Library/Frameworks/Python.framework/Versions/3.11/bin - ls -l ~/Library/Python - find ~/Library/Python + find ~ whereis coscmd coscmd -v From 4c3be25a437f2c8d45bebf6c2f5ce3de8872629d Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 10 Nov 2022 13:17:45 +0800 Subject: [PATCH 2/9] Update release-macos.yml --- .github/workflows/release-macos.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 12a5fca3..81a79e0e 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -21,10 +21,8 @@ jobs: run: | sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/python -m pip install --upgrade pip sudo pip3 install coscmd + echo /Library/Frameworks/Python.framework/Versions/3.11/bin >> $GITHUB_PATH echo $PATH - find /Library/Frameworks/Python.framework/Versions/3.11/bin - find ~ - whereis coscmd coscmd -v - name: Install pnpm From 8ad17f3af186d806fca35456e17c7cafe93d3aeb Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 10 Nov 2022 13:33:17 +0800 Subject: [PATCH 3/9] Update release-macos.yml --- .github/workflows/release-macos.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 81a79e0e..0347261d 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -22,7 +22,14 @@ jobs: sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/python -m pip install --upgrade pip sudo pip3 install coscmd echo /Library/Frameworks/Python.framework/Versions/3.11/bin >> $GITHUB_PATH + echo /Library/Frameworks/Python.framework/Versions/3.11/bin >> $PATH + echo $GITHUB_PATH + + - name: coscmd test + run: | echo $PATH + echo $GITHUB_PATH + /Library/Frameworks/Python.framework/Versions/3.11/bin/coscmd -v coscmd -v - name: Install pnpm From 72da43c7343300010b9ea6f3c511ec3adca284d7 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 10 Nov 2022 13:37:26 +0800 Subject: [PATCH 4/9] Update release-macos.yml --- .github/workflows/release-macos.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 0347261d..ac91ff8a 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -21,9 +21,8 @@ jobs: run: | sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/python -m pip install --upgrade pip sudo pip3 install coscmd - echo /Library/Frameworks/Python.framework/Versions/3.11/bin >> $GITHUB_PATH - echo /Library/Frameworks/Python.framework/Versions/3.11/bin >> $PATH - echo $GITHUB_PATH + echo "/Library/Frameworks/Python.framework/Versions/3.11/bin" >> $GITHUB_PATH + echo $PATH - name: coscmd test run: | From 0395662c1835aec4f30162cfb4ab42404ba4582f Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 10 Nov 2022 13:41:07 +0800 Subject: [PATCH 5/9] Update release-macos.yml --- .github/workflows/release-macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index ac91ff8a..f74a336b 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -22,13 +22,13 @@ jobs: sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/python -m pip install --upgrade pip sudo pip3 install coscmd echo "/Library/Frameworks/Python.framework/Versions/3.11/bin" >> $GITHUB_PATH - echo $PATH + sudo ln -s /Library/Frameworks/Python.framework/Versions/3.11/bin/coscmd /usr/bin/coscmd - name: coscmd test run: | echo $PATH - echo $GITHUB_PATH /Library/Frameworks/Python.framework/Versions/3.11/bin/coscmd -v + /usr/bin/coscmd -v coscmd -v - name: Install pnpm From aff8586d3757008749b7572d7bc85a6a014ece71 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 10 Nov 2022 13:43:06 +0800 Subject: [PATCH 6/9] Update release-macos.yml --- .github/workflows/release-macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index f74a336b..863046f8 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -22,13 +22,13 @@ jobs: sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/python -m pip install --upgrade pip sudo pip3 install coscmd echo "/Library/Frameworks/Python.framework/Versions/3.11/bin" >> $GITHUB_PATH - sudo ln -s /Library/Frameworks/Python.framework/Versions/3.11/bin/coscmd /usr/bin/coscmd + sudo ln -s /Library/Frameworks/Python.framework/Versions/3.11/bin/coscmd /usr/local/bin/coscmd - name: coscmd test run: | echo $PATH /Library/Frameworks/Python.framework/Versions/3.11/bin/coscmd -v - /usr/bin/coscmd -v + /usr/local/bin/coscmd -v coscmd -v - name: Install pnpm From df9e7b035abec42fbd4fde186bfa3b76e012d209 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 10 Nov 2022 13:47:18 +0800 Subject: [PATCH 7/9] Update release-macos.yml --- .github/workflows/release-macos.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 863046f8..f16f1164 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -9,6 +9,8 @@ on: branches: [main] paths: - "share/const.go" +env: + COSCMD: /Library/Frameworks/Python.framework/Versions/3.11/bin/coscmd jobs: release: @@ -22,14 +24,10 @@ jobs: sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/python -m pip install --upgrade pip sudo pip3 install coscmd echo "/Library/Frameworks/Python.framework/Versions/3.11/bin" >> $GITHUB_PATH - sudo ln -s /Library/Frameworks/Python.framework/Versions/3.11/bin/coscmd /usr/local/bin/coscmd - name: coscmd test run: | - echo $PATH - /Library/Frameworks/Python.framework/Versions/3.11/bin/coscmd -v - /usr/local/bin/coscmd -v - coscmd -v + $COSCMD -v - name: Install pnpm run: npm install -g pnpm @@ -116,11 +114,11 @@ jobs: BUCKET: release-sv-1252011659 REGION: na-siliconvalley run: | - coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION + $COSCMD config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - name: Push To Silicon Valley run: | - for file in ./dist/release/*; do coscmd upload $file /archives/; done; + for file in ./dist/release/*; do $COSCMD upload $file /archives/; done; - name: Archive production artifacts uses: actions/upload-artifact@v3 From 13ddd5fab5afb6a2f8da0e6a262c8035f62f9273 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 10 Nov 2022 13:49:53 +0800 Subject: [PATCH 8/9] Update release-macos.yml --- .github/workflows/release-macos.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index f16f1164..446c0131 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -27,7 +27,8 @@ jobs: - name: coscmd test run: | - $COSCMD -v + coscmd -h + $COSCMD -h - name: Install pnpm run: npm install -g pnpm From b67ff1e0ca5e0fd06738478872efee7536878adf Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 10 Nov 2022 13:53:07 +0800 Subject: [PATCH 9/9] Update release-macos.yml --- .github/workflows/release-macos.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index 446c0131..79a162c0 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -9,8 +9,6 @@ on: branches: [main] paths: - "share/const.go" -env: - COSCMD: /Library/Frameworks/Python.framework/Versions/3.11/bin/coscmd jobs: release: @@ -24,12 +22,7 @@ jobs: sudo /Library/Frameworks/Python.framework/Versions/3.11/bin/python -m pip install --upgrade pip sudo pip3 install coscmd echo "/Library/Frameworks/Python.framework/Versions/3.11/bin" >> $GITHUB_PATH - - - name: coscmd test - run: | - coscmd -h - $COSCMD -h - + - name: Install pnpm run: npm install -g pnpm @@ -115,11 +108,11 @@ jobs: BUCKET: release-sv-1252011659 REGION: na-siliconvalley run: | - $COSCMD config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION + coscmd config -a $SECRET_ID -s $SECRET_KEY -b $BUCKET -r $REGION - name: Push To Silicon Valley run: | - for file in ./dist/release/*; do $COSCMD upload $file /archives/; done; + for file in ./dist/release/*; do coscmd upload $file /archives/; done; - name: Archive production artifacts uses: actions/upload-artifact@v3