Merge #10686

[rust.git] / .github / workflows / release.yaml

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7549e998bcadfeb705249a6e9df7d27d09b4b516..f0ff7d71fc7cf37d5bd945921a1d64fbe2a4cb61 100644 (file)
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -13,7 +13,7 @@ env:
   CARGO_NET_RETRY: 10
   RUSTFLAGS: "-D warnings -W unreachable-pub"
   RUSTUP_MAX_RETRIES: 10
-  FETCH_DEPTH: 200
+  FETCH_DEPTH: 0 # pull in the tags for the version string
 
 jobs:
   dist-x86_64-pc-windows-msvc:
@@ -85,7 +85,7 @@ jobs:
 
   dist-x86_64-unknown-linux-gnu:
     name: dist (x86_64-unknown-linux-gnu)
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     env:
       RA_TARGET: x86_64-unknown-linux-gnu
 
@@ -108,16 +108,8 @@ jobs:
       with:
         node-version: 12.x
 
-    - name: Print current revision
-      run: git describe --tags
-
     - name: Dist
-      if: github.ref == 'refs/heads/release'
-      run: cargo xtask dist --client 0.2.$GITHUB_RUN_NUMBER
-
-    - name: Dist
-      if: github.ref != 'refs/heads/release'
-      run: cargo xtask dist --nightly --client 0.3.$GITHUB_RUN_NUMBER-nightly
+      run: cargo xtask dist --client-patch-version $GITHUB_RUN_NUMBER
 
     - name: Run analysis-stats on rust-analyzer
       run: target/${{ env.RA_TARGET }}/release/rust-analyzer analysis-stats .
@@ -131,67 +123,70 @@ jobs:
         name: dist-x86_64-unknown-linux-gnu
         path: ./dist
 
-  dist-x86_64-unknown-linux-musl:
-    name: dist (x86_64-unknown-linux-musl)
+  dist-aarch64-unknown-linux-gnu:
+    name: dist (aarch64-unknown-linux-gnu)
     runs-on: ubuntu-20.04
     env:
-      RA_TARGET: x86_64-unknown-linux-musl
-      # For some reason `-crt-static` is not working for clang without lld
-      RUSTFLAGS: "-C link-arg=-fuse-ld=lld -C target-feature=-crt-static"
-    container:
-      image: rust:alpine
-      volumes:
-      - /usr/local/cargo/registry
+      RA_TARGET: aarch64-unknown-linux-gnu
+      CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
 
     steps:
-    - name: Install dependencies
-      run: apk add --no-cache git clang lld musl-dev
-
     - name: Checkout repository
       uses: actions/checkout@v2
       with:
         fetch-depth: ${{ env.FETCH_DEPTH }}
 
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        target: aarch64-unknown-linux-gnu
+        profile: minimal
+        override: true
+
+    - name: Update apt repositories
+      run: sudo apt-get update
+
+    - name: Install target toolchain
+      run: sudo apt-get install gcc-aarch64-linux-gnu
+
     - name: Dist
       run: cargo xtask dist
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with:
-        name: dist-x86_64-unknown-linux-musl
+        name: dist-aarch64-unknown-linux-gnu
         path: ./dist
 
-  dist-aarch64-unknown-linux-gnu:
-    name: dist (aarch64-unknown-linux-gnu)
-    runs-on: ubuntu-16.04
+  dist-x86_64-unknown-linux-musl:
+    name: dist (x86_64-unknown-linux-musl)
+    runs-on: ubuntu-latest
     env:
-      RA_TARGET: aarch64-unknown-linux-gnu
-      CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
+      RA_TARGET: x86_64-unknown-linux-musl
+      # For some reason `-crt-static` is not working for clang without lld
+      RUSTFLAGS: "-C link-arg=-fuse-ld=lld -C target-feature=-crt-static"
+    container:
+      image: rust:alpine
+      volumes:
+      - /usr/local/cargo/registry
 
     steps:
+    - name: Install dependencies
+      run: apk add --no-cache git clang lld musl-dev
+
     - name: Checkout repository
       uses: actions/checkout@v2
       with:
         fetch-depth: ${{ env.FETCH_DEPTH }}
 
-    - name: Install Rust toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        target: aarch64-unknown-linux-gnu
-        profile: minimal
-        override: true
-
-    - name: Install target toolchain
-      run: sudo apt-get install gcc-aarch64-linux-gnu
-
     - name: Dist
       run: cargo xtask dist
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v1
       with:
-        name: dist-aarch64-unknown-linux-gnu
+        name: dist-x86_64-unknown-linux-musl
         path: ./dist
 
   dist-x86_64-apple-darwin:
@@ -261,7 +256,7 @@ jobs:
 
   publish:
     name: publish
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
     needs: ['dist-x86_64-pc-windows-msvc', 'dist-aarch64-pc-windows-msvc', 'dist-x86_64-unknown-linux-gnu', 'dist-x86_64-unknown-linux-musl', 'dist-aarch64-unknown-linux-gnu', 'dist-x86_64-apple-darwin', 'dist-aarch64-apple-darwin']
     steps:
     - name: Install Nodejs
@@ -269,7 +264,7 @@ jobs:
       with:
         node-version: 12.x
 
-    - run: echo "TAG=$(date --iso --utc)" >> $GITHUB_ENV
+    - run: echo "TAG=$(date --iso -u)" >> $GITHUB_ENV
       if: github.ref == 'refs/heads/release'
     - run: echo "TAG=nightly" >> $GITHUB_ENV
       if: github.ref != 'refs/heads/release'