Skip to content

Commit 02d17df

Browse files
SaadnajmiSaadnajmi
authored
chore(0.79): Merge up to 0.79.6 (#2650)
## Summary: Merge up to the tip of `0.79-stable` upstream, which is at 0.79.6
1 parent 914140d commit 02d17df

File tree

152 files changed

+2528
-3697
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+2528
-3697
lines changed

‎.ado/publish.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ variables:
2121
# Only workaround for now is to disable CodeQL on Apple jobs.
2222
- name: Codeql.Enabled
2323
value: false
24-
- template: /.ado/variables/vars.yml@self
2524

2625
resources:
2726
repositories:

‎.github/actions/build-hermesc-linux/action.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ runs:
1414
shell: bash
1515
run: |
1616
sudo apt update
17-
sudo apt install -y git openssh-client cmake build-essential \
17+
sudo apt install -y git openssh-client build-essential \
1818
libreadline-dev libicu-dev jq zip python3
19+
20+
# Install cmake 3.28.3-1build7
21+
sudo apt-get install cmake=3.28.3-1build7
22+
sudo ln -sf /usr/bin/cmake /usr/local/bin/cmake
1923
- name: Restore Hermes workspace
2024
uses: ./.github/actions/restore-hermes-workspace
2125
- name: Linux cache

‎.github/actions/build-hermesc-windows/action.yml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ runs:
1414
uses: actions/download-artifact@v4
1515
with:
1616
name: hermes-workspace
17-
path: 'D:\tmp\hermes'
17+
path: 'C:\tmp\hermes'
1818
- name: Set up workspace
1919
shell: powershell
2020
run: |
21-
mkdir -p D:\tmp\hermes\osx-bin
21+
mkdir -p C:\tmp\hermes\osx-bin
2222
mkdir -p .\packages\react-native\sdks\hermes
23-
cp -r -Force D:\tmp\hermes\hermes\* .\packages\react-native\sdks\hermes\.
23+
cp -r -Force C:\tmp\hermes\hermes\* .\packages\react-native\sdks\hermes\.
2424
cp -r -Force .\packages\react-native\sdks\hermes-engine\utils\* .\packages\react-native\sdks\hermes\.
2525
- name: Windows cache
2626
uses: actions/cache@v4
2727
with:
28-
key: v2-hermes-${{ github.job }}-windows-${{ inputs.hermes-version }}-${{ inputs.react-native-version }}
28+
key: v3-hermes-${{ github.job }}-windows-${{ inputs.hermes-version }}-${{ inputs.react-native-version }}
2929
path: |
30-
D:\tmp\hermes\win64-bin\
31-
D:\tmp\hermes\hermes\icu\
32-
D:\tmp\hermes\hermes\deps\
33-
D:\tmp\hermes\hermes\build_release\
30+
C:\tmp\hermes\win64-bin\
31+
C:\tmp\hermes\hermes\icu\
32+
C:\tmp\hermes\hermes\deps\
33+
C:\tmp\hermes\hermes\build_release\
3434
- name: setup-msbuild
3535
uses: microsoft/[email protected]
3636
- name: Set up workspace
@@ -39,6 +39,9 @@ runs:
3939
New-Item -ItemType Directory -ErrorAction SilentlyContinue $Env:HERMES_WS_DIR\icu
4040
New-Item -ItemType Directory -ErrorAction SilentlyContinue $Env:HERMES_WS_DIR\deps
4141
New-Item -ItemType Directory -ErrorAction SilentlyContinue $Env:HERMES_WS_DIR\win64-bin
42+
- name: Downgrade CMake
43+
shell: powershell
44+
run: choco install cmake --version 3.31.6 --force
4245
- name: Build HermesC for Windows
4346
shell: powershell
4447
run: |
@@ -60,7 +63,7 @@ runs:
6063
$Env:PATH += ";$Env:CMAKE_DIR;$Env:MSBUILD_DIR"
6164
$Env:ICU_ROOT = "$Env:HERMES_WS_DIR\icu"
6265
63-
cmake -S hermes -B build_release -G 'Visual Studio 16 2019' -Ax64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True -DHERMES_ENABLE_WIN10_ICU_FALLBACK=OFF
66+
cmake -S hermes -B build_release -G 'Visual Studio 17 2022' -Ax64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True -DHERMES_ENABLE_WIN10_ICU_FALLBACK=OFF
6467
if (-not $?) { throw "Failed to configure Hermes" }
6568
echo "Running windows build..."
6669
cd build_release
@@ -80,4 +83,4 @@ runs:
8083
uses: actions/[email protected]
8184
with:
8285
name: hermes-win64-bin
83-
path: D:\tmp\hermes\win64-bin\
86+
path: C:\tmp\hermes\win64-bin\

‎.github/workflow-scripts/publishTemplate.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ module.exports.verifyPublishedTemplate = async (
6969
retries = MAX_RETRIES,
7070
) => {
7171
try {
72+
if (version.startsWith('v')) {
73+
version = version.slice(1);
74+
}
7275
await verifyPublishedPackage(
7376
TEMPLATE_NPM_PKG,
7477
version,

‎.github/workflow-scripts/verifyReleaseOnNpm.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ module.exports.verifyReleaseOnNpm = async (
2323
retries = MAX_RETRIES,
2424
) => {
2525
const tag = version.includes('-rc.') ? 'next' : latest ? 'latest' : null;
26+
if (version.startsWith('v')) {
27+
version = version.slice(1);
28+
}
2629
await verifyPublishedPackage(REACT_NATIVE_NPM_PKG, version, tag, retries);
2730
};

‎.github/workflows/microsoft-pr.yml‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -127,36 +127,34 @@ jobs:
127127
permissions: {}
128128
uses: ./.github/workflows/microsoft-build-rntester.yml
129129

130-
test-react-native-macos-init:
131-
name: "Test react-native-macos init"
132-
permissions: {}
133-
# https://github.com/microsoft/react-native-macos/issues/2344
134-
# Run only for stable branches. Once nightlies are available, enable on main as well.
135-
if: ${{ endsWith(github.base_ref, '-stable') }}
136-
uses: ./.github/workflows/microsoft-test-react-native-macos-init.yml
130+
# https://github.com/microsoft/react-native-macos/issues/2344
131+
# Disable these tests because verdaccio hangs
132+
# test-react-native-macos-init:
133+
# name: "Test react-native-macos init"
134+
# permissions: {}
135+
# if: ${{ endsWith(github.base_ref, '-stable') }}
136+
# uses: ./.github/workflows/microsoft-test-react-native-macos-init.yml
137137

138-
react-native-test-app-integration:
139-
name: "Test react-native-test-app integration"
140-
permissions: {}
141-
# https://github.com/microsoft/react-native-macos/issues/2344
142-
# Run only for stable branches. Once nightlies are available, enable on main as well.
143-
if: ${{ endsWith(github.base_ref, '-stable') }}
144-
uses: ./.github/workflows/microsoft-react-native-test-app-integration.yml
138+
# https://github.com/microsoft/react-native-macos/issues/2344
139+
# Disable these tests because verdaccio hangs
140+
# react-native-test-app-integration:
141+
# name: "Test react-native-test-app integration"
142+
# permissions: {}
143+
# if: ${{ endsWith(github.base_ref, '-stable') }}
144+
# uses: ./.github/workflows/microsoft-react-native-test-app-integration.yml
145145

146-
all:
147-
name: "All"
146+
PR:
147+
name: "PR"
148148
permissions: {}
149149
runs-on: ubuntu-latest
150150
needs:
151151
- lint-title
152-
- build-website
153152
- npm-publish-dry-run
154153
- yarn-constraints
155154
- javascript-tests
156155
- build-rntester
157-
- test-react-native-macos-init
158-
- react-native-test-app-integration
159-
if: always()
156+
# - test-react-native-macos-init
157+
# - react-native-test-app-integration
160158
steps:
161159
- name: All required jobs passed
162160
run: echo "All required jobs completed."

‎.github/workflows/nightly.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ jobs:
119119
react-native-version: ${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
120120

121121
build_hermesc_windows:
122-
runs-on: windows-2019
122+
runs-on: windows-2025
123123
needs: prepare_hermes_workspace
124124
env:
125-
HERMES_WS_DIR: 'D:\tmp\hermes'
126-
HERMES_TARBALL_ARTIFACTS_DIR: 'D:\tmp\hermes\hermes-runtime-darwin'
127-
HERMES_OSXBIN_ARTIFACTS_DIR: 'D:\tmp\hermes\osx-bin'
125+
HERMES_WS_DIR: 'C:\tmp\hermes'
126+
HERMES_TARBALL_ARTIFACTS_DIR: 'C:\tmp\hermes\hermes-runtime-darwin'
127+
HERMES_OSXBIN_ARTIFACTS_DIR: 'C:\tmp\hermes\osx-bin'
128128
ICU_URL: "https://github.com/unicode-org/icu/releases/download/release-64-2/icu4c-64_2-Win64-MSVC2017.zip"
129129
MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin'
130130
CMAKE_DIR: 'C:\Program Files\CMake\bin'

‎.github/workflows/publish-release.yml‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ jobs:
115115
react-native-version: ${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
116116

117117
build_hermesc_windows:
118-
runs-on: windows-2019
118+
runs-on: windows-2025
119119
needs: prepare_hermes_workspace
120120
env:
121-
HERMES_WS_DIR: 'D:\tmp\hermes'
122-
HERMES_TARBALL_ARTIFACTS_DIR: 'D:\tmp\hermes\hermes-runtime-darwin'
123-
HERMES_OSXBIN_ARTIFACTS_DIR: 'D:\tmp\hermes\osx-bin'
121+
HERMES_WS_DIR: 'C:\tmp\hermes'
122+
HERMES_TARBALL_ARTIFACTS_DIR: 'C:\tmp\hermes\hermes-runtime-darwin'
123+
HERMES_OSXBIN_ARTIFACTS_DIR: 'C:\tmp\hermes\osx-bin'
124124
ICU_URL: "https://github.com/unicode-org/icu/releases/download/release-64-2/icu4c-64_2-Win64-MSVC2017.zip"
125125
MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin'
126126
CMAKE_DIR: 'C:\Program Files\CMake\bin'
@@ -133,27 +133,6 @@ jobs:
133133
hermes-version: ${{ needs.prepare_hermes_workspace.outputs.hermes-version }}
134134
react-native-version: ${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
135135

136-
build_android:
137-
runs-on: 8-core-ubuntu
138-
needs: [set_release_type]
139-
container:
140-
image: reactnativecommunity/react-native-android:latest
141-
env:
142-
TERM: "dumb"
143-
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
144-
ORG_GRADLE_PROJECT_SIGNING_PWD: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_PWD }}
145-
ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_KEY }}
146-
ORG_GRADLE_PROJECT_SONATYPE_USERNAME: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_USERNAME }}
147-
ORG_GRADLE_PROJECT_SONATYPE_PASSWORD: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_PASSWORD }}
148-
steps:
149-
- name: Checkout
150-
uses: actions/checkout@v4
151-
- name: Build Android
152-
uses: ./.github/actions/build-android
153-
with:
154-
release-type: ${{ needs.set_release_type.outputs.RELEASE_TYPE }}
155-
gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
156-
157136
build_npm_package:
158137
runs-on: 8-core-ubuntu
159138
needs:
@@ -163,7 +142,6 @@ jobs:
163142
build_hermes_macos,
164143
build_hermesc_linux,
165144
build_hermesc_windows,
166-
build_android,
167145
prebuild_apple_dependencies,
168146
]
169147
container:
@@ -226,6 +204,6 @@ jobs:
226204
github-token: ${{ secrets.REACT_NATIVE_BOT_GITHUB_TOKEN }}
227205
script: |
228206
const {verifyReleaseOnNpm} = require('./.github/workflow-scripts/verifyReleaseOnNpm.js');
229-
const {isLatest()} = require('./.github/workflow-scripts/publishTemplate.js');
207+
const {isLatest} = require('./.github/workflow-scripts/publishTemplate.js');
230208
const version = "${{ github.ref_name }}";
231209
await verifyReleaseOnNpm(version, isLatest());

‎.github/workflows/test-all.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,12 +411,12 @@ jobs:
411411
react-native-version: ${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
412412

413413
build_hermesc_windows:
414-
runs-on: windows-2019
414+
runs-on: windows-2025
415415
needs: prepare_hermes_workspace
416416
env:
417-
HERMES_WS_DIR: 'D:\tmp\hermes'
418-
HERMES_TARBALL_ARTIFACTS_DIR: 'D:\tmp\hermes\hermes-runtime-darwin'
419-
HERMES_OSXBIN_ARTIFACTS_DIR: 'D:\tmp\hermes\osx-bin'
417+
HERMES_WS_DIR: 'C:\tmp\hermes'
418+
HERMES_TARBALL_ARTIFACTS_DIR: 'C:\tmp\hermes\hermes-runtime-darwin'
419+
HERMES_OSXBIN_ARTIFACTS_DIR: 'C:\tmp\hermes\osx-bin'
420420
ICU_URL: "https://github.com/unicode-org/icu/releases/download/release-64-2/icu4c-64_2-Win64-MSVC2017.zip"
421421
MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin'
422422
CMAKE_DIR: 'C:\Program Files\CMake\bin'

‎build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ nexusPublishing {
5454
sonatype {
5555
username.set(sonatypeUsername)
5656
password.set(sonatypePassword)
57+
nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
58+
snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
5759
}
5860
}
5961
}

0 commit comments

Comments
 (0)