8 files changed, 354 insertions, 273 deletions

diff --git a/.github/actions/github-release/Dockerfile b/.github/actions/github-release/Dockerfile
new file mode 100644
index 000000000..5849eac7d
--- /dev/null
+++ b/.github/actions/github-release/Dockerfile
@@ -0,0 +1,8 @@
+FROM node:slim
+
+COPY . /action
+WORKDIR /action
+
+RUN npm install --production
+
+ENTRYPOINT ["node", "/action/main.js"]
diff --git a/.github/actions/github-release/README.md b/.github/actions/github-release/README.md
new file mode 100644
index 000000000..7b50d0020
--- /dev/null
+++ b/.github/actions/github-release/README.md
@@ -0,0 +1,21 @@
+# github-release
+
+Copy-pasted from
+https://github.com/bytecodealliance/wasmtime/tree/8acfdbdd8aa550d1b84e0ce1e6222a6605d14e38/.github/actions/github-release
+
+An action used to publish GitHub releases for `wasmtime`.
+
+As of the time of this writing there's a few actions floating around which
+perform github releases but they all tend to have their set of drawbacks.
+Additionally nothing handles deleting releases which we need for our rolling
+`dev` release.
+
+To handle all this this action rolls-its-own implementation using the
+actions/toolkit repository and packages published there. These run in a Docker
+container and take various inputs to orchestrate the release from the build.
+
+More comments can be found in `main.js`.
+
+Testing this is really hard. If you want to try though run `npm install` and
+then `node main.js`. You'll have to configure a bunch of env vars though to get
+anything reasonably working.
diff --git a/.github/actions/github-release/action.yml b/.github/actions/github-release/action.yml
new file mode 100644
index 000000000..51a074adf
--- /dev/null
+++ b/.github/actions/github-release/action.yml
@@ -0,0 +1,15 @@
+name: 'wasmtime github releases'
+description: 'wasmtime github releases'
+inputs:
+  token:
+    description: ''
+    required: true
+  name:
+    description: ''
+    required: true
+  files:
+    description: ''
+    required: true
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
diff --git a/.github/actions/github-release/main.js b/.github/actions/github-release/main.js
new file mode 100644
index 000000000..295c02626
--- /dev/null
+++ b/.github/actions/github-release/main.js
@@ -0,0 +1,117 @@
+const core = require('@actions/core');
+const path = require("path");
+const fs = require("fs");
+const github = require('@actions/github');
+const glob = require('glob');
+
+function sleep(milliseconds) {
+  return new Promise(resolve => setTimeout(resolve, milliseconds))
+}
+
+async function runOnce() {
+  // Load all our inputs and env vars. Note that `getInput` reads from `INPUT_*`
+  const files = core.getInput('files');
+  const name = core.getInput('name');
+  const token = core.getInput('token');
+  const slug = process.env.GITHUB_REPOSITORY;
+  const owner = slug.split('/')[0];
+  const repo = slug.split('/')[1];
+  const sha = process.env.GITHUB_SHA;
+
+  core.info(`files: ${files}`);
+  core.info(`name: ${name}`);
+  core.info(`token: ${token}`);
+
+  const octokit = new github.GitHub(token);
+
+  // Delete the previous release since we can't overwrite one. This may happen
+  // due to retrying an upload or it may happen because we're doing the dev
+  // release.
+  const releases = await octokit.paginate("GET /repos/:owner/:repo/releases", { owner, repo });
+  for (const release of releases) {
+    if (release.tag_name !== name) {
+      continue;
+    }
+    const release_id = release.id;
+    core.info(`deleting release ${release_id}`);
+    await octokit.repos.deleteRelease({ owner, repo, release_id });
+  }
+
+  // We also need to update the `dev` tag while we're at it on the `dev` branch.
+  if (name == 'nightly') {
+    try {
+      core.info(`updating nightly tag`);
+      await octokit.git.updateRef({
+          owner,
+          repo,
+          ref: 'tags/nightly',
+          sha,
+          force: true,
+      });
+    } catch (e) {
+      console.log("ERROR: ", JSON.stringify(e, null, 2));
+      core.info(`creating nightly tag`);
+      await octokit.git.createTag({
+        owner,
+        repo,
+        tag: 'nightly',
+        message: 'nightly release',
+        object: sha,
+        type: 'commit',
+      });
+    }
+  }
+
+  // Creates an official GitHub release for this `tag`, and if this is `dev`
+  // then we know that from the previous block this should be a fresh release.
+  core.info(`creating a release`);
+  const release = await octokit.repos.createRelease({
+    owner,
+    repo,
+    tag_name: name,
+    prerelease: name === 'nightly',
+  });
+
+  // Upload all the relevant assets for this release as just general blobs.
+  for (const file of glob.sync(files)) {
+    const size = fs.statSync(file).size;
+    core.info(`upload ${file}`);
+    await octokit.repos.uploadReleaseAsset({
+      data: fs.createReadStream(file),
+      headers: { 'content-length': size, 'content-type': 'application/octet-stream' },
+      name: path.basename(file),
+      url: release.data.upload_url,
+    });
+  }
+}
+
+async function run() {
+  const retries = 10;
+  for (let i = 0; i < retries; i++) {
+    try {
+      await runOnce();
+      break;
+    } catch (e) {
+      if (i === retries - 1)
+        throw e;
+      logError(e);
+      console.log("RETRYING after 10s");
+      await sleep(10000)
+    }
+  }
+}
+
+function logError(e) {
+  console.log("ERROR: ", e.message);
+  try {
+    console.log(JSON.stringify(e, null, 2));
+  } catch (e) {
+    // ignore json errors for now
+  }
+  console.log(e.stack);
+}
+
+run().catch(err => {
+  logError(err);
+  core.setFailed(err.message);
+});
diff --git a/.github/actions/github-release/package.json b/.github/actions/github-release/package.json
new file mode 100644
index 000000000..abfc55f6f
--- /dev/null
+++ b/.github/actions/github-release/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "wasmtime-github-release",
+  "version": "0.0.0",
+  "main": "main.js",
+  "dependencies": {
+    "@actions/core": "^1.0.0",
+    "@actions/github": "^1.0.0",
+    "glob": "^7.1.5"
+  }
+}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 50c4265cf..633015956 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,28 +3,30 @@ on:
   pull_request:
   push:
     branches:
-      - master
-      - staging
-      - trying
+    - master
+    - staging
+    - trying
 
 jobs:
   rust-audit:
     name: Audit Rust vulnerabilities
     runs-on: ubuntu-latest
     steps:
-        - name: Checkout repository
-          uses: actions/checkout@v1
+    - name: Checkout repository
+      uses: actions/checkout@v1
 
-        - run: cargo install cargo-audit
-        - run: cargo audit
+    - run: cargo install cargo-audit
+    - run: cargo audit
 
   rust:
     name: Rust
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+
     env:
       RUSTFLAGS: -D warnings
       CC: deny_c
@@ -32,62 +34,57 @@ jobs:
       RUN_SLOW_TESTS: 1
       RUSTUP_MAX_RETRIES: 10
       CARGO_NET_RETRY: 10
-    steps:
 
-      - name: Checkout repository
-        uses: actions/checkout@v1
-
-      # We need to disable the existing toolchain to avoid updating rust-docs
-      # which takes a long time. The fastest way to do this is to rename the
-      # existing folder, as deleting it takes about as much time as not doing
-      # anything and just updating rust-docs.
-      - name: Rename existing rust toolchain (Windows)
-        if: matrix.os == 'windows-latest'
-        run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
-
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
-          components: rustfmt, rust-src
-
-      - name: Cache cargo registry
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/registry
-          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Cache cargo index
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/git
-          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Cache cargo target dir
-        uses: actions/cache@v1
-        with:
-          path: target
-          key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Compile
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --no-run
-
-      - name: Test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-
-      - name: Prepare cache
-        run: cargo xtask pre-cache
-
-      - name: Prepare cache 2
-        if: matrix.os == 'windows-latest'
-        run: Remove-Item ./target/debug/xtask.exe, ./target/debug/deps/xtask.exe
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v1
+
+    # We need to disable the existing toolchain to avoid updating rust-docs
+    # which takes a long time. The fastest way to do this is to rename the
+    # existing folder, as deleting it takes about as much time as not doing
+    # anything and just updating rust-docs.
+    - name: Rename existing rust toolchain (Windows)
+      if: matrix.os == 'windows-latest'
+      run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
+
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        override: true
+        components: rustfmt, rust-src
+
+    - name: Cache cargo registry
+      uses: actions/cache@v1
+      with:
+        path: ~/.cargo/registry
+        key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Cache cargo index
+      uses: actions/cache@v1
+      with:
+        path: ~/.cargo/git
+        key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Cache cargo target dir
+      uses: actions/cache@v1
+      with:
+        path: target
+        key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Compile
+      run: cargo test --no-run
+
+    - name: Test
+      run: cargo test
+
+    - name: Prepare cache
+      run: cargo xtask pre-cache
+
+    - name: Prepare cache 2
+      if: matrix.os == 'windows-latest'
+      run: Remove-Item ./target/debug/xtask.exe, ./target/debug/deps/xtask.exe
 
   typescript:
     name: TypeScript
@@ -96,22 +93,22 @@ jobs:
       CXX: g++-4.9
       CC: gcc-4.9
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v1
+    - name: Checkout repository
+      uses: actions/checkout@v1
 
-      - name: Install Nodejs
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
+    - name: Install Nodejs
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
 
-      - run: npm ci
-        working-directory: ./editors/code
+    - run: npm ci
+      working-directory: ./editors/code
 
-      - run: npm audit
-        working-directory: ./editors/code
+    - run: npm audit
+      working-directory: ./editors/code
 
-      - run: npm run lint
-        working-directory: ./editors/code
+    - run: npm run lint
+      working-directory: ./editors/code
 
-      - run: npm run package --scripts-prepend-node-path
-        working-directory: ./editors/code
+    - run: npm run package --scripts-prepend-node-path
+      working-directory: ./editors/code
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a697c0071..8100c04ef 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,193 +1,110 @@
 name: release
 on:
+  schedule:
+  - cron: '*/15 * * * *' # midnight UTC
+
   push:
     branches:
-      - release
+    - release
 
 jobs:
-  build-server:
-    name: build-server
+  dist:
+    name: dist
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+
     env:
       RUSTFLAGS: -D warnings
       CARGO_INCREMENTAL: 0
       RUSTUP_MAX_RETRIES: 10
       CARGO_NET_RETRY: 10
-    steps:
 
-      - name: Checkout repository
-        uses: actions/checkout@v1
-
-      # We need to disable the existing toolchain to avoid updating rust-docs
-      # which takes a long time. The fastest way to do this is to rename the
-      # existing folder, as deleting it takes about as much time as not doing
-      # anything and just updating rust-docs.
-      - name: Rename existing rust toolchain (Windows)
-        if: matrix.os == 'windows-latest'
-        run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
-
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          target: x86_64-unknown-linux-musl
-          override: true
-
-      - name: Build
-        if: matrix.os == 'ubuntu-latest'
-        uses: actions-rs/cargo@v1
-        env:
-          CC: clang
-        with:
-          command: build
-          args: --package rust-analyzer --bin rust-analyzer --release --target x86_64-unknown-linux-musl
-
-      - name: Build
-        if: matrix.os != 'ubuntu-latest'
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --package rust-analyzer --bin rust-analyzer --release
-
-      - name: Create distribution dir
-        run: mkdir ./dist
-
-      - name: Copy binary
-        if: matrix.os == 'ubuntu-latest'
-        run: cp ./target/x86_64-unknown-linux-musl/release/rust-analyzer ./dist/rust-analyzer-linux && strip ./dist/rust-analyzer-linux
-
-      - name: Copy binary
-        if: matrix.os == 'macos-latest'
-        run: cp ./target/release/rust-analyzer ./dist/rust-analyzer-mac
-
-      - name: Copy binary
-        if: matrix.os == 'windows-latest'
-        run: copy ./target/release/rust-analyzer.exe ./dist/rust-analyzer-windows.exe
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: server-${{ matrix.os }}
-          path: ./dist
-
-  build-clients:
-    name: build-clients
-    runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v1
-
-      - name: Install Nodejs
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-
-      - run: npm ci
-        working-directory: ./editors/code
-
-      - run: npm run package --scripts-prepend-node-path
-        working-directory: ./editors/code
-
-      - name: Copy vscode extension
-        run: mkdir -p ./dist/code && cp ./editors/code/rust-analyzer.vsix ./dist/
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: editor-plugins
-          path: ./dist
-
-  make-release:
-    name: make-release
+    - name: Checkout repository
+      uses: actions/checkout@v1
+
+    # We need to disable the existing toolchain to avoid updating rust-docs
+    # which takes a long time. The fastest way to do this is to rename the
+    # existing folder, as deleting it takes about as much time as not doing
+    # anything and just updating rust-docs.
+    - name: Rename existing rust toolchain (Windows)
+      if: matrix.os == 'windows-latest'
+      run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
+
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        target: x86_64-unknown-linux-musl
+        override: true
+
+    - name: Install Nodejs
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
+
+    - name: Dist
+      if: github.event_name == 'push'
+      run: cargo xtask dist
+
+    - name: Dist
+      if: github.event_name != 'push'
+      run: cargo xtask dist --nightly
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: dist-${{ matrix.os }}
+        path: ./dist
+
+  publish:
+    name: publish
     runs-on: ubuntu-latest
-    needs: ['build-server', 'build-clients']
+    needs: ['dist']
     steps:
-      - name: Install Nodejs
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-
-      - run: echo "::set-env name=TAG::$(date --iso)"
-      - run: 'echo "TAG: $TAG"'
-
-      - name: Checkout repository
-        uses: actions/checkout@v1
-
-      - uses: actions/download-artifact@v1
-        with:
-          name: editor-plugins
-          path: dist
-      - uses: actions/download-artifact@v1
-        with:
-          name: server-macos-latest
-          path: dist
-      - uses: actions/download-artifact@v1
-        with:
-          name: server-ubuntu-latest
-          path: dist
-      - uses: actions/download-artifact@v1
-        with:
-          name: server-windows-latest
-          path: dist
-      - run: ls -all ./dist
-
-      - name: Create Release
-        id: create_release
-        # uses: actions/create-release@v1
-        # https://github.com/actions/create-release/pull/32
-        uses: fleskesvor/create-release@1a72e235c178bf2ae6c51a8ae36febc24568c5fe
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ env.TAG }}
-          release_name: ${{ env.TAG }}
-          draft: false
-          prerelease: false
-
-      - uses: actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/rust-analyzer-linux
-          asset_name: rust-analyzer-linux
-          asset_content_type: application/octet-stream
-
-      - uses: actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/rust-analyzer-mac
-          asset_name: rust-analyzer-mac
-          asset_content_type: application/octet-stream
-
-      - uses: actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/rust-analyzer-windows.exe
-          asset_name: rust-analyzer-windows.exe
-          asset_content_type: application/octet-stream
-
-      - uses: actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./dist/rust-analyzer.vsix
-          asset_name: rust-analyzer.vsix
-          asset_content_type: application/octet-stream
-
-      - run: npm ci
-        working-directory: ./editors/code
-
-      - name: Publish Extension
-        working-directory: ./editors/code
-        # token from https://dev.azure.com/rust-analyzer/
-        run: npx vsce publish 0.1.$(date +%Y%m%d) --pat ${{ secrets.MARKETPLACE_TOKEN }}
+    - name: Install Nodejs
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
+
+    - run: echo "::set-env name=TAG::$(date --iso)"
+      if: github.event_name == 'push'
+    - run: echo "::set-env name=TAG::nightly"
+      if: github.event_name == 'schedule'
+    - run: 'echo "TAG: $TAG"'
+
+    - name: Checkout repository
+      uses: actions/checkout@v1
+
+    - uses: actions/download-artifact@v1
+      with:
+        name: dist-macos-latest
+        path: dist
+    - uses: actions/download-artifact@v1
+      with:
+        name: dist-ubuntu-latest
+        path: dist
+    - uses: actions/download-artifact@v1
+      with:
+        name: dist-windows-latest
+        path: dist
+    - run: ls -all ./dist
+
+    - name: Publish Release
+      uses: ./.github/actions/github-release
+      with:
+        files: "dist/*"
+        name: ${{ env.TAG }}
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+    - run: npm ci
+      working-directory: ./editors/code
+
+    - name: Publish Extension
+      if: github.event_name == 'push'
+      working-directory: ./editors/code
+      # token from https://dev.azure.com/rust-analyzer/
+      run: npx vsce publish 0.1.$(date +%Y%m%d) --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ../../dist/rust-analyzer.vsix
diff --git a/.github/workflows/rustdoc.yaml b/.github/workflows/rustdoc.yaml
index caa1dcc30..e75e92695 100644
--- a/.github/workflows/rustdoc.yaml
+++ b/.github/workflows/rustdoc.yaml
@@ -2,7 +2,7 @@ name: rustdoc
 on:
   push:
    branches:
-     - master
+   - master
 
 jobs:
   rustdoc:
@@ -12,28 +12,24 @@ jobs:
       CARGO_INCREMENTAL: 0
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v1
+    - name: Checkout repository
+      uses: actions/checkout@v1
 
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
-          components: rustfmt, rust-src
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        override: true
+        components: rustfmt, rust-src
 
-      - name: Build Documentation
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --all --no-deps
+    - name: Build Documentation
+      run: cargo doc --all --no-deps
 
-      - name: Deploy Docs
-        uses: peaceiris/[email protected]
-        env:
-          ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-          PUBLISH_BRANCH: gh-pages
-          PUBLISH_DIR: ./target/doc
-        with:
-          forceOrphan: true
+    - name: Deploy Docs
+      uses: peaceiris/actions-gh-pages@364c31d33bb99327c77b3a5438a83a357a6729ad # v3.4.0
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_branch: gh-pages
+        publish_dir: ./target/doc
+        force_orphan: true