浏览代码

upload gh-actions built binaries to the main folder

let's hope they work fine
Dan Korostelev 5 年之前
父节点
当前提交
e0525c3ea2
共有 3 个文件被更改,包括 4 次插入93 次删除
  1. 2 2
      .github/workflows/main.yml
  2. 0 89
      azure-pipelines.yml
  3. 2 2
      extra/github-actions/workflows/main.yml

+ 2 - 2
.github/workflows/main.yml

@@ -687,7 +687,7 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.HXBUILDS_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.HXBUILDS_AWS_SECRET_ACCESS_KEY }}
-          HXBUILDS_S3ADDR: ${{ secrets.HXBUILDS_S3ADDR }}/gh-actions
+          HXBUILDS_S3ADDR: ${{ secrets.HXBUILDS_S3ADDR }}
         run: |
           set -ex
           COMMIT_HASH_SHORT=${GITHUB_SHA:0:7}
@@ -709,7 +709,7 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.HXBUILDS_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.HXBUILDS_AWS_SECRET_ACCESS_KEY }}
-          HXBUILDS_S3ADDR: ${{ secrets.HXBUILDS_S3ADDR }}/gh-actions
+          HXBUILDS_S3ADDR: ${{ secrets.HXBUILDS_S3ADDR }}
         run: |
           set -ex
           aws s3 cp linuxBinaries/*_bin.tar.gz      ${HXBUILDS_S3ADDR}/haxe/linux64/haxe_latest.tar.gz

+ 0 - 89
azure-pipelines.yml

@@ -189,92 +189,3 @@ stages:
         parameters:
           name: TestWin32
           arch: '32'
-
-  - stage: StageDeploy
-    condition: and(succeeded(), not(variables['System.PullRequest.PullRequestId']))
-    jobs:
-      - job: S3
-        condition: and(succeeded(), variables['HXBUILDS_AWS_ACCESS_KEY_ID'], variables['HXBUILDS_S3ADDR'])
-        pool:
-          vmImage: 'ubuntu-16.04'
-        steps:
-          - checkout: self
-            fetchDepth: 20
-          - task: DownloadPipelineArtifact@0
-            inputs:
-              artifactName: 'linuxBinaries'
-              targetPath: linuxBinaries
-            displayName: Download linuxBinaries
-          - task: DownloadPipelineArtifact@0
-            inputs:
-              artifactName: 'macBinaries'
-              targetPath: macBinaries
-            displayName: Download macBinaries
-          - task: DownloadPipelineArtifact@0
-            inputs:
-              artifactName: 'win64Binaries'
-              targetPath: win64Binaries
-            displayName: Download win64Binaries
-          - task: DownloadPipelineArtifact@0
-            inputs:
-              artifactName: 'win32Binaries'
-              targetPath: win32Binaries
-            displayName: Download win32Binaries
-          - template: extra/azure-pipelines/install-neko-snapshot.yaml
-            parameters:
-              platform: linux64
-          - script: |
-              set -ex
-              tar -xf linuxBinaries/*_bin.tar.gz -C linuxBinaries --strip-components=1
-              sudo mkdir -p /usr/local/bin/
-              sudo mkdir -p /usr/local/share/haxe/
-              sudo ln -s `pwd`/linuxBinaries/haxe /usr/local/bin/haxe
-              sudo ln -s `pwd`/linuxBinaries/haxelib /usr/local/bin/haxelib
-              sudo ln -s `pwd`/linuxBinaries/std /usr/local/share/haxe/std
-            displayName: Setup Haxe
-          - script: |
-              set -ex
-              sudo apt-get update -qqy
-              sudo apt-get install -qqy awscli
-            displayName: "Install awscli"
-          - script: |
-              set -ex
-              COMMIT_HASH=`git rev-parse HEAD`
-              COMMIT_HASH_SHORT=${COMMIT_HASH:0:7}
-              COMMIT_DATE=`TZ=UTC git show --quiet --date='format-local:%Y-%m-%d' --format="%cd"`
-              FILE_NAME=haxe_${COMMIT_DATE}_$(Build.SourceBranchName)_${COMMIT_HASH_SHORT}
-              aws s3 cp linuxBinaries/*_bin.tar.gz      $(HXBUILDS_S3ADDR)/haxe/linux64/${FILE_NAME}.tar.gz
-              aws s3 cp macBinaries/*_bin.tar.gz        $(HXBUILDS_S3ADDR)/haxe/mac/${FILE_NAME}.tar.gz
-              aws s3 cp macBinaries/*_installer.tar.gz  $(HXBUILDS_S3ADDR)/haxe/mac-installer/${FILE_NAME}.tar.gz
-              aws s3 cp win64Binaries/*_bin.zip         $(HXBUILDS_S3ADDR)/haxe/windows64/${FILE_NAME}.zip
-              aws s3 cp win64Binaries/*_installer.zip   $(HXBUILDS_S3ADDR)/haxe/windows64-installer/${FILE_NAME}.zip
-              aws s3 cp win64Binaries/*.nupkg           $(HXBUILDS_S3ADDR)/haxe/windows64-choco/
-              aws s3 cp win32Binaries/*_bin.zip         $(HXBUILDS_S3ADDR)/haxe/windows/${FILE_NAME}.zip
-              aws s3 cp win32Binaries/*_installer.zip   $(HXBUILDS_S3ADDR)/haxe/windows-installer/${FILE_NAME}.zip
-              aws s3 cp win32Binaries/*.nupkg           $(HXBUILDS_S3ADDR)/haxe/windows-choco/
-            env:
-              AWS_ACCESS_KEY_ID: $(HXBUILDS_AWS_ACCESS_KEY_ID)
-              AWS_SECRET_ACCESS_KEY: $(HXBUILDS_AWS_SECRET_ACCESS_KEY)
-            displayName: Upload binaries
-          - script: |
-              set -ex
-              aws s3 cp linuxBinaries/*_bin.tar.gz      $(HXBUILDS_S3ADDR)/haxe/linux64/haxe_latest.tar.gz
-              aws s3 cp macBinaries/*_bin.tar.gz        $(HXBUILDS_S3ADDR)/haxe/mac/haxe_latest.tar.gz
-              aws s3 cp macBinaries/*_installer.tar.gz        $(HXBUILDS_S3ADDR)/haxe/mac-installer/haxe_latest.tar.gz
-              aws s3 cp win64Binaries/*_bin.zip         $(HXBUILDS_S3ADDR)/haxe/windows64/haxe_latest.zip
-              aws s3 cp win64Binaries/*_installer.zip   $(HXBUILDS_S3ADDR)/haxe/windows64-installer/haxe_latest.zip
-              aws s3 cp win32Binaries/*_bin.zip         $(HXBUILDS_S3ADDR)/haxe/windows/haxe_latest.zip
-              aws s3 cp win32Binaries/*_installer.zip   $(HXBUILDS_S3ADDR)/haxe/windows-installer/haxe_latest.zip
-
-              # Chocolatey packages have to be named with version number,
-              # so let's use web redirection to keep the original file name.
-              [[ "$HXBUILDS_S3ADDR" =~ s3://([^/]+)(.*) ]] && HXBUILDS_S3BUCKET="${BASH_REMATCH[1]}" && HXBUILDS_S3PATH="${BASH_REMATCH[2]}"
-              [[ `echo win64Binaries/*.nupkg` =~ win64Binaries/(.+) ]] && FILE_NAME="${BASH_REMATCH[1]}"
-              aws s3 cp $(HXBUILDS_S3ADDR)/haxe/windows64-choco/${FILE_NAME} $(HXBUILDS_S3ADDR)/haxe/windows64-choco/haxe_latest.nupkg --acl public-read --website-redirect "${HXBUILDS_S3PATH}/haxe/windows64-choco/${FILE_NAME}"
-              [[ `echo win32Binaries/*.nupkg` =~ win32Binaries/(.+) ]] && FILE_NAME="${BASH_REMATCH[1]}"
-              aws s3 cp $(HXBUILDS_S3ADDR)/haxe/windows-choco/${FILE_NAME}   $(HXBUILDS_S3ADDR)/haxe/windows-choco/haxe_latest.nupkg   --acl public-read --website-redirect "${HXBUILDS_S3PATH}/haxe/windows-choco/${FILE_NAME}"
-            env:
-              AWS_ACCESS_KEY_ID: $(HXBUILDS_AWS_ACCESS_KEY_ID)
-              AWS_SECRET_ACCESS_KEY: $(HXBUILDS_AWS_SECRET_ACCESS_KEY)
-            condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'development'))
-            displayName: Update "latest"

+ 2 - 2
extra/github-actions/workflows/main.yml

@@ -219,7 +219,7 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.HXBUILDS_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.HXBUILDS_AWS_SECRET_ACCESS_KEY }}
-          HXBUILDS_S3ADDR: ${{ secrets.HXBUILDS_S3ADDR }}/gh-actions
+          HXBUILDS_S3ADDR: ${{ secrets.HXBUILDS_S3ADDR }}
         run: |
           set -ex
           COMMIT_HASH_SHORT=${GITHUB_SHA:0:7}
@@ -241,7 +241,7 @@ jobs:
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.HXBUILDS_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.HXBUILDS_AWS_SECRET_ACCESS_KEY }}
-          HXBUILDS_S3ADDR: ${{ secrets.HXBUILDS_S3ADDR }}/gh-actions
+          HXBUILDS_S3ADDR: ${{ secrets.HXBUILDS_S3ADDR }}
         run: |
           set -ex
           aws s3 cp linuxBinaries/*_bin.tar.gz      ${HXBUILDS_S3ADDR}/haxe/linux64/haxe_latest.tar.gz