1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00

ci: revert changed to canary uploads (#25733)

All these changes made CI fail consistently with random exit code 1
after successful upload.
This commit is contained in:
Bartek Iwańczuk 2024-09-19 14:54:59 +01:00 committed by GitHub
parent e97f00f6f6
commit dcc95112f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 45 deletions

View file

@ -158,7 +158,7 @@ const cloneRepoStep = [{
// Use depth > 1, because sometimes we need to rebuild main and if // Use depth > 1, because sometimes we need to rebuild main and if
// other commits have landed it will become impossible to rebuild if // other commits have landed it will become impossible to rebuild if
// the checkout is too shallow. // the checkout is too shallow.
"fetch-depth": 50, "fetch-depth": 5,
submodules: false, submodules: false,
}, },
}]; }];
@ -813,14 +813,8 @@ const ci = {
].join("\n"), ].join("\n"),
run: [ run: [
'gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/', 'gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/',
'latest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt)', "echo ${{ github.sha }} > canary-latest.txt",
"git cat-file -e $latest_canary_hash", 'gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt',
"if [ $? -eq 0 ]; then",
" echo ${{ github.sha }} > canary-latest.txt",
' gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt',
"else",
' echo "Skipping upload, because newer canary version is already available"',
"fi",
].join("\n"), ].join("\n"),
}, },
{ {
@ -1087,7 +1081,6 @@ const ci = {
if: if:
"github.repository == 'denoland/deno' && github.ref == 'refs/heads/main'", "github.repository == 'denoland/deno' && github.ref == 'refs/heads/main'",
steps: [ steps: [
...cloneRepoStep,
authenticateWithGoogleCloud, authenticateWithGoogleCloud,
{ {
name: "Setup gcloud", name: "Setup gcloud",
@ -1099,14 +1092,8 @@ const ci = {
{ {
name: "Upload canary version file to dl.deno.land", name: "Upload canary version file to dl.deno.land",
run: [ run: [
"latest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-latest.txt)", "echo ${{ github.sha }} > canary-latest.txt",
"git cat-file -e $latest_canary_hash", 'gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-latest.txt',
"if [ $? -eq 0]; then",
" echo ${{ github.sha }} > canary-latest.txt",
' gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-latest.txt',
"else",
' echo "Skipping upload, because newer canary version is already available"',
"fi",
].join("\n"), ].join("\n"),
}, },
], ],

View file

@ -33,7 +33,7 @@ jobs:
- name: Clone repository - name: Clone repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 50 fetch-depth: 5
submodules: false submodules: false
if: github.event.pull_request.draft == true if: github.event.pull_request.draft == true
- id: check - id: check
@ -148,7 +148,7 @@ jobs:
- name: Clone repository - name: Clone repository
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
fetch-depth: 50 fetch-depth: 5
submodules: false submodules: false
if: '!(matrix.skip)' if: '!(matrix.skip)'
- name: Clone submodule ./tests/util/std - name: Clone submodule ./tests/util/std
@ -486,14 +486,8 @@ jobs:
github.ref == 'refs/heads/main') github.ref == 'refs/heads/main')
run: |- run: |-
gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/ gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/
latest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt)
git cat-file -e $latest_canary_hash
if [ $? -eq 0 ]; then
echo ${{ github.sha }} > canary-latest.txt echo ${{ github.sha }} > canary-latest.txt
gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt
else
echo "Skipping upload, because newer canary version is already available"
fi
- name: Autobahn testsuite - name: Autobahn testsuite
if: |- if: |-
!(matrix.skip) && ((matrix.os == 'linux' && matrix.arch != 'aarch64') && !(matrix.skip) && ((matrix.os == 'linux' && matrix.arch != 'aarch64') &&
@ -683,15 +677,6 @@ jobs:
- build - build
if: github.repository == 'denoland/deno' && github.ref == 'refs/heads/main' if: github.repository == 'denoland/deno' && github.ref == 'refs/heads/main'
steps: steps:
- name: Configure git
run: |-
git config --global core.symlinks true
git config --global fetch.parallel 32
- name: Clone repository
uses: actions/checkout@v4
with:
fetch-depth: 50
submodules: false
- name: Authenticate with Google Cloud - name: Authenticate with Google Cloud
uses: google-github-actions/auth@v2 uses: google-github-actions/auth@v2
with: with:
@ -705,11 +690,5 @@ jobs:
project_id: denoland project_id: denoland
- name: Upload canary version file to dl.deno.land - name: Upload canary version file to dl.deno.land
run: |- run: |-
latest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-latest.txt)
git cat-file -e $latest_canary_hash
if [ $? -eq 0]; then
echo ${{ github.sha }} > canary-latest.txt echo ${{ github.sha }} > canary-latest.txt
gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-latest.txt gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-latest.txt
else
echo "Skipping upload, because newer canary version is already available"
fi