Skip to content

Commit

Permalink
Remove mirror option because it's nearly useless now
Browse files Browse the repository at this point in the history
  • Loading branch information
@jurplel
jurplel committed Jan 21, 2021
1 parent 5c4038e commit 49465b8
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 14 deletions.
7 changes: 0 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,6 @@ Possible values: `qtcharts`, `qtdatavis3d`, `qtpurchasing`, `qtvirtualkeyboard`,

Default: none

### `mirror`
Forces a different Qt mirror in case there is a problem with the default.

If you have problems, you can try: `http://mirrors.ocf.berkeley.edu/qt/`

Default: none

### `cached`
If it is set to `true`, then Qt won't be downloaded, but the environment variables will be set, and essential build tools will be installed.

Expand Down
2 changes: 0 additions & 2 deletions action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ inputs:
default: 'true'
modules:
description: 'Additional Qt modules to install'
mirror:
description: 'Force a Qt mirror in case the default is not working'
cached:
description: "Whether or not to actually download Qt"
default: 'false'
Expand Down
5 changes: 0 additions & 5 deletions src/main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ async function run() {
let host = core.getInput("host");
const target = core.getInput("target");
let arch = core.getInput("arch");
const mirror = core.getInput("mirror");
const extra = core.getInput("extra");
const modules = core.getInput("modules");

Expand Down Expand Up @@ -97,10 +96,6 @@ async function run() {

let extraArgs = ["-O", `${dir}`]

if (mirror) {
extraArgs.push("-b");
extraArgs.push(mirror);
}
if (extra) {
extra.split(" ").forEach(function(string) {
extraArgs.push(string);
Expand Down

6 comments on commit 49465b8

@dlyr
Copy link

@dlyr dlyr commented on 49465b8 Jan 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I use to have this option activated, how it's useless ? can I safely remove it without relying on qt download website availability (I set this options lately when qt website was down for several days)
Thanks for the precision.

@jurplel
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aqtinstall has added support upstream for automatic mirror redirection. If qt's site is down, it will try mirrors from an internal list. You can still pass the mirror if you use the extra argument and give it -b https://mirror.com/mirror

@dlyr
Copy link

@dlyr dlyr commented on 49465b8 Jan 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fantastic, thanks for the answer.

@jurplel
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing!

@Saviq
Copy link

@Saviq Saviq commented on 49465b8 Feb 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW this doesn't seem to be working well, see miurahr/aqtinstall#215.

Shouldn't a change like this result in a version bump on the action?

@jurplel
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right that I should have done a version bump. It looks like aqtinstall 1.1.1 might have fixed it though, give it a try.

Please sign in to comment.