Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ci) Clean up Windows artifacts, installer, LLVM etc. #2112 #2116

Merged
merged 10 commits into from
Feb 12, 2021

Conversation

Hywan
Copy link
Contributor

@Hywan Hywan commented Feb 11, 2021

(re-edit of #2112)

Description

  1. 7ff16b4, First, we need to use our own LLVM built for Windows. This has been commited by error, see Improved Apple Silicon & LLVM 11 support #2008 (comment). Our LLVM built aren't designed for mingw32. Let's keep LLVM from Choco for the moment.
  2. 3946f3c, Second, we copy the ATTRIBUTIONS and LICENSE files twice. That's useless :-).
  3. efff2c8 , Third, as discussed with @MarkMcCaskey, we want to rename wasmer-windows.exe to wasmer-windows-installer.exe for the sake of clarity. It will break the Wasmer installer, so let's keep that name as is.
  4. 1a03e88, Fourth, let's create a wasmer.tar.gz archive for Windows.
  5. 67e8679, Fiveth, let's upload the wasmer.tar.gz archive for Windows.
  6. cf0c56c, Use wasmer.zip on Windows because it's difficult to untar+ungzip on this OS (as discused with @MarkMcCaskey).

Review

  • Add a short description of the the change to the CHANGELOG.md file not necessary

@Hywan Hywan self-assigned this Feb 11, 2021
@Hywan Hywan added 🤖 bot Bip bip 🧪 tests I love tests labels Feb 11, 2021
@Hywan
Copy link
Contributor Author

Hywan commented Feb 11, 2021

bors r+

bors bot added a commit that referenced this pull request Feb 11, 2021
2116: fix(ci) Clean up Windows artifacts, installer, LLVM etc. #2112 r=Hywan a=Hywan

(re-edit of #2112)

# Description

1.  7ff16b4, First, we need to use our own LLVM built for Windows. This has been commited by error, see #2008 (comment).
2. 3946f3c, Second, we copy the `ATTRIBUTIONS` and `LICENSE` files twice. That's useless :-).
3. efff2c8 ,  Third, as discussed with @MarkMcCaskey, we want to rename `wasmer-windows.exe` to `wasmer-windows-installer.exe` for the sake of clarity.
4. 1a03e88, Fourth, let's create a `wasmer.tar.gz` archive for Windows.
5. 67e8679, Fiveth, let's upload the `wasmer.tar.gz` archive for Windows.
6. cf0c56c, Use `wasmer.zip` on Windows because it's difficult to untar+ungzip on this OS (as discused with @MarkMcCaskey).

# Review

- [ ] ~Add a short description of the the change to the CHANGELOG.md file~ not necessary


Co-authored-by: Ivan Enderlin <[email protected]>
@bors
Copy link
Contributor

bors bot commented Feb 11, 2021

Build failed:

`github.workspace` uses `\` for the path separator. It creates
confusion in Bash. This patch just uses the `.llvm` directory to
contain LLVM, and use `pwd` to get an absolute path for
`LLVM_SYS_110_PREFIX` and `PATH`.
@Hywan
Copy link
Contributor Author

Hywan commented Feb 11, 2021

bors r+

bors bot added a commit that referenced this pull request Feb 11, 2021
2116: fix(ci) Clean up Windows artifacts, installer, LLVM etc. #2112 r=Hywan a=Hywan

(re-edit of #2112)

# Description

1.  7ff16b4, First, we need to use our own LLVM built for Windows. This has been commited by error, see #2008 (comment).
2. 3946f3c, Second, we copy the `ATTRIBUTIONS` and `LICENSE` files twice. That's useless :-).
3. efff2c8 ,  Third, as discussed with @MarkMcCaskey, we want to rename `wasmer-windows.exe` to `wasmer-windows-installer.exe` for the sake of clarity.
4. 1a03e88, Fourth, let's create a `wasmer.tar.gz` archive for Windows.
5. 67e8679, Fiveth, let's upload the `wasmer.tar.gz` archive for Windows.
6. cf0c56c, Use `wasmer.zip` on Windows because it's difficult to untar+ungzip on this OS (as discused with @MarkMcCaskey).

# Review

- [ ] ~Add a short description of the the change to the CHANGELOG.md file~ not necessary


Co-authored-by: Ivan Enderlin <[email protected]>
@bors
Copy link
Contributor

bors bot commented Feb 11, 2021

Build failed:

@Hywan
Copy link
Contributor Author

Hywan commented Feb 11, 2021

bors r+

bors bot added a commit that referenced this pull request Feb 11, 2021
2116: fix(ci) Clean up Windows artifacts, installer, LLVM etc. #2112 r=Hywan a=Hywan

(re-edit of #2112)

# Description

1.  ~7ff16b4, First, we need to use our own LLVM built for Windows. This has been commited by error, see #2008 (comment) Our LLVM built aren't designed for mingw32. Let's keep LLVM from Choco for the moment.
2. 3946f3c, Second, we copy the `ATTRIBUTIONS` and `LICENSE` files twice. That's useless :-).
3. ~efff2c8 ,  Third, as discussed with @MarkMcCaskey, we want to rename `wasmer-windows.exe` to `wasmer-windows-installer.exe` for the sake of clarity.~ It will break the Wasmer installer, so let's keep that name as is.
4. 1a03e88, Fourth, let's create a `wasmer.tar.gz` archive for Windows.
5. 67e8679, Fiveth, let's upload the `wasmer.tar.gz` archive for Windows.
6. cf0c56c, Use `wasmer.zip` on Windows because it's difficult to untar+ungzip on this OS (as discused with @MarkMcCaskey).

# Review

- [ ] ~Add a short description of the the change to the CHANGELOG.md file~ not necessary


Co-authored-by: Ivan Enderlin <[email protected]>
@bors
Copy link
Contributor

bors bot commented Feb 11, 2021

Build failed:

@Hywan
Copy link
Contributor Author

Hywan commented Feb 11, 2021

/usr/bin/bash: zip: command not found

are you kidding me… :-@

@Hywan
Copy link
Contributor Author

Hywan commented Feb 11, 2021

bors r+

@bors
Copy link
Contributor

bors bot commented Feb 12, 2021

@bors bors bot merged commit 40bdfa4 into master Feb 12, 2021
@bors bors bot deleted the fix-windows-package branch February 12, 2021 00:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🤖 bot Bip bip 🧪 tests I love tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants