Skip to content

[chore] small tweaks & bump VMs in CI - #979

Merged
HeyImChris merged 10 commits into
mainfrom
kelset/update-vms-for-ado
Feb 4, 2022
Merged

[chore] small tweaks & bump VMs in CI#979
HeyImChris merged 10 commits into
mainfrom
kelset/update-vms-for-ado

Conversation

@kelset

@kelsetLorenzo Sciandra (kelset) commented Jan 24, 2022•
edited
Loading

Copy link
Copy Markdown

Please select one of the following

  • I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  • I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  • I am making a fix / change for the macOS implementation of react-native
  • I am making a change required for Microsoft usage of react-native

(wasn't really sure what to pick tbh)

Summary

While digging around the code I noticed that the ADO vms used by this repo are a bit outdated. So I tweaked a bit the vars.yml file, added all the referenced VMs, and updated to newer versions.
I've matched the "latest" ones but used the fixed reference, according to the docs: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
This is aligned with what react-native-test-app is using: https://github.com/microsoft/react-native-test-app/blob/trunk/.github/workflows/build.yml

Moreover, I've set the Xcode version to match the one set as default by the new macos VM: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode

This is actually something we might want to discuss about, since technically in the CircleCI config we should also change to match, potentially: https://github.com/microsoft/react-native-macos/blob/main/.circleci/config.yml#L55

I didn't change it since it seems to be a config we have in place just because we're a fork of core and they have a CircleCI config? https://github.com/facebook/react-native/blob/1b31d6bb582768ccbe92d3c1a9e43354a8c531e5/.circleci/config.yml#L55

So wanted to check before diverging from upstream.

To sum it up:

  • ubuntu-18.04 -> ubuntu-20.04
  • macOS-10.15 -> macOS-11
  • Xcode_12_4 -> Xcode_13_1

Test Plan

Running on CI is itself the test, let's see how it goes :)

Saadnajmi
Saad Najmi (Saadnajmi) reviewed Jan 24, 2022
View reviewed changes
Comment thread.ado/publish.yml Outdated
Comment thread.ado/variables/vars.yml Outdated
@SaadnajmiSaad Najmi (Saadnajmi) mentioned this pull request Jan 27, 2022
Closed
4 tasks
@kelset

Lorenzo Sciandra (kelset) commented Jan 27, 2022•
edited
Loading

Copy link
Copy Markdown
Author

Update on this PR - I spent some time trying to get to the bottom of the CI ❌

Screenshot 2022-01-27 at 15 00 36

I did some basic digging around but I couldn't find anything specific that could address it, so I'll go into the 0.66 branch, verify if it happens there, and adapt accordingly. Will report back afterwards.

This is because I noticed that CI seems faulty in main:

@HeyImChris
HeyImChris merged commit 6a6e7fa into mainFeb 4, 2022
@kelset
Lorenzo Sciandra (kelset) deleted the kelset/update-vms-for-ado branch February 4, 2022 16:52
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SaadnajmiSaad Najmi (Saadnajmi)Awaiting requested review from Saadnajmi
1 more reviewer
@HeyImChrisHeyImChrisHeyImChris approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kelset@Saadnajmi@HeyImChris
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[chore] small tweaks & bump VMs in CI by kelset · Pull Request #979 · microsoft/react-native-macos · GitHub
Skip to content
[chore] small tweaks & bump VMs in CI - #979
Merged
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Feb 4, 2022
Merged
[chore] small tweaks & bump VMs in CI#979
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Conversation
@kelset
@kelsetLorenzo Sciandra (kelset)
commented
Jan 24, 2022•

edited

Loading

Copy link


Copy Markdown

Please select one of the following
  •  I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  •  I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  •  I am making a fix / change for the macOS implementation of react-native
  •  I am making a change required for Microsoft usage of react-native
(wasn't really sure what to pick tbh)
Summary
While digging around the code I noticed that the ADO vms used by this repo are a bit outdated. So I tweaked a bit the vars.yml file, added all the referenced VMs, and updated to newer versions.

I've matched the "latest" ones but used the fixed reference, according to the docs: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software

This is aligned with what react-native-test-app is using: https://github.com/microsoft/react-native-test-app/blob/trunk/.github/workflows/build.yml
Moreover, I've set the Xcode version to match the one set as default by the new macos VM: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
This is actually something we might want to discuss about, since technically in the CircleCI config we should also change to match, potentially: https://github.com/microsoft/react-native-macos/blob/main/.circleci/config.yml#L55
I didn't change it since it seems to be a config we have in place just because we're a fork of core and they have a CircleCI config? https://github.com/facebook/react-native/blob/1b31d6bb582768ccbe92d3c1a9e43354a8c531e5/.circleci/config.yml#L55
So wanted to check before diverging from upstream.
To sum it up:
  • ubuntu-18.04 -> ubuntu-20.04
  • macOS-10.15 -> macOS-11
  • Xcode_12_4 -> Xcode_13_1
Test Plan
Running on CI is itself the test, let's see how it goes :)
Saadnajmi
Saad Najmi (Saadnajmi)
reviewed
Jan 24, 2022
View reviewed changes
Comment thread.ado/publish.yml
Outdated

Comment thread.ado/variables/vars.yml
Outdated

@SaadnajmiSaad Najmi (Saadnajmi)
mentioned this pull request
Jan 27, 2022
 Closed

4 tasks
@kelset
Lorenzo Sciandra (kelset)
commented
Jan 27, 2022•

edited

Loading

Copy link


Copy Markdown

Author
Update on this PR - I spent some time trying to get to the bottom of the CI ❌
Screenshot 2022-01-27 at 15 00 36

I did some basic digging around but I couldn't find anything specific that could address it, so I'll go into the 0.66 branch, verify if it happens there, and adapt accordingly. Will report back afterwards.

This is because I noticed that CI seems faulty in main:
@HeyImChris
HeyImChris
merged commit 6a6e7fa
into
mainFeb 4, 2022
@kelset
Lorenzo Sciandra (kelset)
deleted the

kelset/update-vms-for-ado

branch
February 4, 2022 16:52
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SaadnajmiSaad Najmi (Saadnajmi)Awaiting requested review from Saadnajmi

1 more reviewer

@HeyImChrisHeyImChrisHeyImChris approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kelset@Saadnajmi@HeyImChris

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[chore] small tweaks & bump VMs in CI by kelset · Pull Request #979 · microsoft/react-native-macos · GitHub
Skip to content
[chore] small tweaks & bump VMs in CI - #979
Merged
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Feb 4, 2022
Merged
[chore] small tweaks & bump VMs in CI#979
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Conversation
@kelset
@kelsetLorenzo Sciandra (kelset)
commented
Jan 24, 2022•

edited

Loading

Copy link


Copy Markdown

Please select one of the following
  •  I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  •  I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  •  I am making a fix / change for the macOS implementation of react-native
  •  I am making a change required for Microsoft usage of react-native
(wasn't really sure what to pick tbh)
Summary
While digging around the code I noticed that the ADO vms used by this repo are a bit outdated. So I tweaked a bit the vars.yml file, added all the referenced VMs, and updated to newer versions.

I've matched the "latest" ones but used the fixed reference, according to the docs: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software

This is aligned with what react-native-test-app is using: https://github.com/microsoft/react-native-test-app/blob/trunk/.github/workflows/build.yml
Moreover, I've set the Xcode version to match the one set as default by the new macos VM: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
This is actually something we might want to discuss about, since technically in the CircleCI config we should also change to match, potentially: https://github.com/microsoft/react-native-macos/blob/main/.circleci/config.yml#L55
I didn't change it since it seems to be a config we have in place just because we're a fork of core and they have a CircleCI config? https://github.com/facebook/react-native/blob/1b31d6bb582768ccbe92d3c1a9e43354a8c531e5/.circleci/config.yml#L55
So wanted to check before diverging from upstream.
To sum it up:
  • ubuntu-18.04 -> ubuntu-20.04
  • macOS-10.15 -> macOS-11
  • Xcode_12_4 -> Xcode_13_1
Test Plan
Running on CI is itself the test, let's see how it goes :)
Saadnajmi
Saad Najmi (Saadnajmi)
reviewed
Jan 24, 2022
View reviewed changes
Comment thread.ado/publish.yml
Outdated

Comment thread.ado/variables/vars.yml
Outdated

@SaadnajmiSaad Najmi (Saadnajmi)
mentioned this pull request
Jan 27, 2022
 Closed

4 tasks
@kelset
Lorenzo Sciandra (kelset)
commented
Jan 27, 2022•

edited

Loading

Copy link


Copy Markdown

Author
Update on this PR - I spent some time trying to get to the bottom of the CI ❌
Screenshot 2022-01-27 at 15 00 36

I did some basic digging around but I couldn't find anything specific that could address it, so I'll go into the 0.66 branch, verify if it happens there, and adapt accordingly. Will report back afterwards.

This is because I noticed that CI seems faulty in main:
@HeyImChris
HeyImChris
merged commit 6a6e7fa
into
mainFeb 4, 2022
@kelset
Lorenzo Sciandra (kelset)
deleted the

kelset/update-vms-for-ado

branch
February 4, 2022 16:52
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SaadnajmiSaad Najmi (Saadnajmi)Awaiting requested review from Saadnajmi

1 more reviewer

@HeyImChrisHeyImChrisHeyImChris approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kelset@Saadnajmi@HeyImChris

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[chore] small tweaks & bump VMs in CI by kelset · Pull Request #979 · microsoft/react-native-macos · GitHub
Skip to content
[chore] small tweaks & bump VMs in CI - #979
Merged
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Feb 4, 2022
Merged
[chore] small tweaks & bump VMs in CI#979
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Conversation
@kelset
@kelsetLorenzo Sciandra (kelset)
commented
Jan 24, 2022•

edited

Loading

Copy link


Copy Markdown

Please select one of the following
  •  I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  •  I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  •  I am making a fix / change for the macOS implementation of react-native
  •  I am making a change required for Microsoft usage of react-native
(wasn't really sure what to pick tbh)
Summary
While digging around the code I noticed that the ADO vms used by this repo are a bit outdated. So I tweaked a bit the vars.yml file, added all the referenced VMs, and updated to newer versions.

I've matched the "latest" ones but used the fixed reference, according to the docs: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software

This is aligned with what react-native-test-app is using: https://github.com/microsoft/react-native-test-app/blob/trunk/.github/workflows/build.yml
Moreover, I've set the Xcode version to match the one set as default by the new macos VM: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
This is actually something we might want to discuss about, since technically in the CircleCI config we should also change to match, potentially: https://github.com/microsoft/react-native-macos/blob/main/.circleci/config.yml#L55
I didn't change it since it seems to be a config we have in place just because we're a fork of core and they have a CircleCI config? https://github.com/facebook/react-native/blob/1b31d6bb582768ccbe92d3c1a9e43354a8c531e5/.circleci/config.yml#L55
So wanted to check before diverging from upstream.
To sum it up:
  • ubuntu-18.04 -> ubuntu-20.04
  • macOS-10.15 -> macOS-11
  • Xcode_12_4 -> Xcode_13_1
Test Plan
Running on CI is itself the test, let's see how it goes :)
Saadnajmi
Saad Najmi (Saadnajmi)
reviewed
Jan 24, 2022
View reviewed changes
Comment thread.ado/publish.yml
Outdated

Comment thread.ado/variables/vars.yml
Outdated

@SaadnajmiSaad Najmi (Saadnajmi)
mentioned this pull request
Jan 27, 2022
 Closed

4 tasks
@kelset
Lorenzo Sciandra (kelset)
commented
Jan 27, 2022•

edited

Loading

Copy link


Copy Markdown

Author
Update on this PR - I spent some time trying to get to the bottom of the CI ❌
Screenshot 2022-01-27 at 15 00 36

I did some basic digging around but I couldn't find anything specific that could address it, so I'll go into the 0.66 branch, verify if it happens there, and adapt accordingly. Will report back afterwards.

This is because I noticed that CI seems faulty in main:
@HeyImChris
HeyImChris
merged commit 6a6e7fa
into
mainFeb 4, 2022
@kelset
Lorenzo Sciandra (kelset)
deleted the

kelset/update-vms-for-ado

branch
February 4, 2022 16:52
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SaadnajmiSaad Najmi (Saadnajmi)Awaiting requested review from Saadnajmi

1 more reviewer

@HeyImChrisHeyImChrisHeyImChris approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kelset@Saadnajmi@HeyImChris

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[chore] small tweaks & bump VMs in CI by kelset · Pull Request #979 · microsoft/react-native-macos · GitHub
Skip to content
[chore] small tweaks & bump VMs in CI - #979
Merged
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Feb 4, 2022
Merged
[chore] small tweaks & bump VMs in CI#979
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Conversation
@kelset
@kelsetLorenzo Sciandra (kelset)
commented
Jan 24, 2022•

edited

Loading

Copy link


Copy Markdown

Please select one of the following
  •  I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  •  I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  •  I am making a fix / change for the macOS implementation of react-native
  •  I am making a change required for Microsoft usage of react-native
(wasn't really sure what to pick tbh)
Summary
While digging around the code I noticed that the ADO vms used by this repo are a bit outdated. So I tweaked a bit the vars.yml file, added all the referenced VMs, and updated to newer versions.

I've matched the "latest" ones but used the fixed reference, according to the docs: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software

This is aligned with what react-native-test-app is using: https://github.com/microsoft/react-native-test-app/blob/trunk/.github/workflows/build.yml
Moreover, I've set the Xcode version to match the one set as default by the new macos VM: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
This is actually something we might want to discuss about, since technically in the CircleCI config we should also change to match, potentially: https://github.com/microsoft/react-native-macos/blob/main/.circleci/config.yml#L55
I didn't change it since it seems to be a config we have in place just because we're a fork of core and they have a CircleCI config? https://github.com/facebook/react-native/blob/1b31d6bb582768ccbe92d3c1a9e43354a8c531e5/.circleci/config.yml#L55
So wanted to check before diverging from upstream.
To sum it up:
  • ubuntu-18.04 -> ubuntu-20.04
  • macOS-10.15 -> macOS-11
  • Xcode_12_4 -> Xcode_13_1
Test Plan
Running on CI is itself the test, let's see how it goes :)
Saadnajmi
Saad Najmi (Saadnajmi)
reviewed
Jan 24, 2022
View reviewed changes
Comment thread.ado/publish.yml
Outdated

Comment thread.ado/variables/vars.yml
Outdated

@SaadnajmiSaad Najmi (Saadnajmi)
mentioned this pull request
Jan 27, 2022
 Closed

4 tasks
@kelset
Lorenzo Sciandra (kelset)
commented
Jan 27, 2022•

edited

Loading

Copy link


Copy Markdown

Author
Update on this PR - I spent some time trying to get to the bottom of the CI ❌
Screenshot 2022-01-27 at 15 00 36

I did some basic digging around but I couldn't find anything specific that could address it, so I'll go into the 0.66 branch, verify if it happens there, and adapt accordingly. Will report back afterwards.

This is because I noticed that CI seems faulty in main:
@HeyImChris
HeyImChris
merged commit 6a6e7fa
into
mainFeb 4, 2022
@kelset
Lorenzo Sciandra (kelset)
deleted the

kelset/update-vms-for-ado

branch
February 4, 2022 16:52
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SaadnajmiSaad Najmi (Saadnajmi)Awaiting requested review from Saadnajmi

1 more reviewer

@HeyImChrisHeyImChrisHeyImChris approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kelset@Saadnajmi@HeyImChris

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[chore] small tweaks & bump VMs in CI by kelset · Pull Request #979 · microsoft/react-native-macos · GitHub
Skip to content
[chore] small tweaks & bump VMs in CI - #979
Merged
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Feb 4, 2022
Merged
[chore] small tweaks & bump VMs in CI#979
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Conversation
@kelset
@kelsetLorenzo Sciandra (kelset)
commented
Jan 24, 2022•

edited

Loading

Copy link


Copy Markdown

Please select one of the following
  •  I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  •  I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  •  I am making a fix / change for the macOS implementation of react-native
  •  I am making a change required for Microsoft usage of react-native
(wasn't really sure what to pick tbh)
Summary
While digging around the code I noticed that the ADO vms used by this repo are a bit outdated. So I tweaked a bit the vars.yml file, added all the referenced VMs, and updated to newer versions.

I've matched the "latest" ones but used the fixed reference, according to the docs: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software

This is aligned with what react-native-test-app is using: https://github.com/microsoft/react-native-test-app/blob/trunk/.github/workflows/build.yml
Moreover, I've set the Xcode version to match the one set as default by the new macos VM: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
This is actually something we might want to discuss about, since technically in the CircleCI config we should also change to match, potentially: https://github.com/microsoft/react-native-macos/blob/main/.circleci/config.yml#L55
I didn't change it since it seems to be a config we have in place just because we're a fork of core and they have a CircleCI config? https://github.com/facebook/react-native/blob/1b31d6bb582768ccbe92d3c1a9e43354a8c531e5/.circleci/config.yml#L55
So wanted to check before diverging from upstream.
To sum it up:
  • ubuntu-18.04 -> ubuntu-20.04
  • macOS-10.15 -> macOS-11
  • Xcode_12_4 -> Xcode_13_1
Test Plan
Running on CI is itself the test, let's see how it goes :)
Saadnajmi
Saad Najmi (Saadnajmi)
reviewed
Jan 24, 2022
View reviewed changes
Comment thread.ado/publish.yml
Outdated

Comment thread.ado/variables/vars.yml
Outdated

@SaadnajmiSaad Najmi (Saadnajmi)
mentioned this pull request
Jan 27, 2022
 Closed

4 tasks
@kelset
Lorenzo Sciandra (kelset)
commented
Jan 27, 2022•

edited

Loading

Copy link


Copy Markdown

Author
Update on this PR - I spent some time trying to get to the bottom of the CI ❌
Screenshot 2022-01-27 at 15 00 36

I did some basic digging around but I couldn't find anything specific that could address it, so I'll go into the 0.66 branch, verify if it happens there, and adapt accordingly. Will report back afterwards.

This is because I noticed that CI seems faulty in main:
@HeyImChris
HeyImChris
merged commit 6a6e7fa
into
mainFeb 4, 2022
@kelset
Lorenzo Sciandra (kelset)
deleted the

kelset/update-vms-for-ado

branch
February 4, 2022 16:52
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SaadnajmiSaad Najmi (Saadnajmi)Awaiting requested review from Saadnajmi

1 more reviewer

@HeyImChrisHeyImChrisHeyImChris approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kelset@Saadnajmi@HeyImChris

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
[chore] small tweaks & bump VMs in CI by kelset · Pull Request #979 · microsoft/react-native-macos · GitHub
Skip to content
[chore] small tweaks & bump VMs in CI - #979
Merged
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Feb 4, 2022
Merged
[chore] small tweaks & bump VMs in CI#979
HeyImChris merged 10 commits into
mainfrom 
kelset/update-vms-for-ado
Conversation
@kelset
@kelsetLorenzo Sciandra (kelset)
commented
Jan 24, 2022•

edited

Loading

Copy link


Copy Markdown

Please select one of the following
  •  I am removing an existing difference between facebook/react-native and microsoft/react-native-macos 👍
  •  I am cherry-picking a change from Facebook's react-native into microsoft/react-native-macos 👍
  •  I am making a fix / change for the macOS implementation of react-native
  •  I am making a change required for Microsoft usage of react-native
(wasn't really sure what to pick tbh)
Summary
While digging around the code I noticed that the ADO vms used by this repo are a bit outdated. So I tweaked a bit the vars.yml file, added all the referenced VMs, and updated to newer versions.

I've matched the "latest" ones but used the fixed reference, according to the docs: https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software

This is aligned with what react-native-test-app is using: https://github.com/microsoft/react-native-test-app/blob/trunk/.github/workflows/build.yml
Moreover, I've set the Xcode version to match the one set as default by the new macos VM: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md#xcode
This is actually something we might want to discuss about, since technically in the CircleCI config we should also change to match, potentially: https://github.com/microsoft/react-native-macos/blob/main/.circleci/config.yml#L55
I didn't change it since it seems to be a config we have in place just because we're a fork of core and they have a CircleCI config? https://github.com/facebook/react-native/blob/1b31d6bb582768ccbe92d3c1a9e43354a8c531e5/.circleci/config.yml#L55
So wanted to check before diverging from upstream.
To sum it up:
  • ubuntu-18.04 -> ubuntu-20.04
  • macOS-10.15 -> macOS-11
  • Xcode_12_4 -> Xcode_13_1
Test Plan
Running on CI is itself the test, let's see how it goes :)
Saadnajmi
Saad Najmi (Saadnajmi)
reviewed
Jan 24, 2022
View reviewed changes
Comment thread.ado/publish.yml
Outdated

Comment thread.ado/variables/vars.yml
Outdated

@SaadnajmiSaad Najmi (Saadnajmi)
mentioned this pull request
Jan 27, 2022
 Closed

4 tasks
@kelset
Lorenzo Sciandra (kelset)
commented
Jan 27, 2022•

edited

Loading

Copy link


Copy Markdown

Author
Update on this PR - I spent some time trying to get to the bottom of the CI ❌
Screenshot 2022-01-27 at 15 00 36

I did some basic digging around but I couldn't find anything specific that could address it, so I'll go into the 0.66 branch, verify if it happens there, and adapt accordingly. Will report back afterwards.

This is because I noticed that CI seems faulty in main:
@HeyImChris
HeyImChris
merged commit 6a6e7fa
into
mainFeb 4, 2022
@kelset
Lorenzo Sciandra (kelset)
deleted the

kelset/update-vms-for-ado

branch
February 4, 2022 16:52
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@SaadnajmiSaad Najmi (Saadnajmi)Awaiting requested review from Saadnajmi

1 more reviewer

@HeyImChrisHeyImChrisHeyImChris approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@kelset@Saadnajmi@HeyImChris