diff --git a/.appveyor/config.yml b/.appveyor/config.yml
deleted file mode 100644
index 7d8a034921dd..000000000000
--- a/.appveyor/config.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-environment:
- ANDROID_HOME: "C:\\android-sdk-windows"
- ANDROID_NDK: "C:\\android-sdk-windows\\android-ndk-r19c"
- ANDROID_BUILD_VERSION: 28
- ANDROID_TOOLS_VERSION: 29.0.2
-
- GRADLE_OPTS: -Dorg.gradle.daemon=false
-
- SDK_TOOLS_URL: https://dl.google.com/android/repository/sdk-tools-windows-3859397.zip
- NDK_TOOLS_URL: https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip
-
- matrix:
- - nodejs_version: 10
- - nodejs_version: 12
-
-install:
- # Install Android SDK Tools
- - mkdir "%ANDROID_HOME%"
- - appveyor DownloadFile "%SDK_TOOLS_URL%" -FileName "%TMP%/sdk-tools.zip"
- - 7z x "%TMP%/sdk-tools.zip" -o"%ANDROID_HOME%" > nul
- - set PATH=%PATH%;"%ANDROID_HOME%\tools\bin"
-
- - yes 2> nul | sdkmanager --licenses > nul
- - yes 2> nul | sdkmanager "system-images;android-19;google_apis;armeabi-v7a"
- - yes 2> nul | sdkmanager "platforms;android-%ANDROID_BUILD_VERSION%"
- - yes 2> nul | sdkmanager "build-tools;%ANDROID_TOOLS_VERSION%"
- - yes 2> nul | sdkmanager "add-ons;addon-google_apis-google-23"
- - yes 2> nul | sdkmanager "extras;android;m2repository"
-
- - appveyor DownloadFile "%NDK_TOOLS_URL%" -FileName "%TMP%/ndk.zip"
- - 7z x "%TMP%/ndk.zip" -o"%ANDROID_HOME%" > nul
-
- - ps: Install-Product node $env:nodejs_version x64
- - npx envinfo@latest
- - appveyor-retry yarn install
-
-build_script:
- - yarn run flow-check-android
- - yarn run flow-check-ios
- - yarn run test
- # - gradlew.bat RNTester:android:app:assembleRelease
-
-cache:
- - node_modules
- - "%LOCALAPPDATA%/Yarn"
- - "%USERPROFILE%/.gradle/caches"
- - "%USERPROFILE%/.gradle/wrapper"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ae1e093fb6c3..4a6f722166fd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,12 @@
version: 2.1
+# -------------------------
+# ORBS
+# -------------------------
+
+orbs:
+ win: circleci/windows@2.4.0
+
# -------------------------
# DEFAULTS
# -------------------------
@@ -13,6 +20,7 @@ defaults: &defaults
- PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A: &github_token_a "78a72af35445ca3f8180"
- PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B: &github_token_b "b1a98e0bbd56ff1ccba1"
+
# -------------------------
# EXECUTORS
# -------------------------
@@ -629,6 +637,70 @@ jobs:
command: |
echo "Nightly build run"
+ # -------------------------
+ # JOBS: Windows
+ # -------------------------
+ windows_job:
+ executor:
+ name: win/default
+ environment:
+ - ANDROID_HOME: "C:\\Android\\android-sdk"
+ - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\19.2.5345600"
+ - ANDROID_BUILD_VERSION: 28
+ - ANDROID_TOOLS_VERSION: 29.0.2
+ - GRADLE_OPTS: -Dorg.gradle.daemon=false
+ - NDK_VERSION: 19.2.5345600
+ steps:
+ - checkout
+ - run:
+ name: Install Android SDK Tools
+ command: choco install android-sdk
+ - run:
+ name: Setup SDK
+ command: sdkmanager --licenses
+ - run: sdkmanager "system-images;android-19;google_apis;armeabi-v7a"
+ - run: sdkmanager "platforms;android-%ANDROID_BUILD_VERSION%"
+ - run: sdkmanager "build-tools;%ANDROID_TOOLS_VERSION%"
+ - run: sdkmanager "add-ons;addon-google_apis-google-23"
+ - run: sdkmanager "extras;android;m2repository"
+ - run: sdkmanager "ndk;%NDK_VERSION%"
+ - restore_cache:
+ keys:
+ - v5-win-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
+ - v5-win-node-{{ arch }}-{{ .Branch }}-
+ - v5-win-node-{{ arch }}-
+ - run:
+ name: Install Yarn
+ command: choco install yarn
+ - run:
+ name: Get Env info
+ command: npx envinfo@latest
+ - run:
+ name: Install Dependencies
+ command: yarn install --frozen-lockfile --non-interactive
+ - save_cache:
+ key: v5-win-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
+ paths:
+ - C:\Users\circleci\AppData\Local\Yarn
+ - run:
+ name: Flow Check Android
+ command: yarn flow-check-android
+ - run:
+ name: Flow Check iOS
+ command: yarn flow-check-ios
+ # TODO: reenable this test
+ # - run:
+ # name: Test Android Build
+ # command: ./gradlew.bat RNTester:android:app:assembleRelease
+ - run:
+ name: Run Test
+ command: yarn test
+ - save_cache:
+ key: v5-win-node-{{ arch }}-{{ .Branch }}-{{ checksum ".gradle" }}
+ paths:
+ - "%USERPROFILE%/.gradle/caches"
+ - "%USERPROFILE%/.gradle/wrapper"
+
# -------------------------
# WORK FLOWS
# -------------------------
@@ -731,7 +803,9 @@ workflows:
- js_coverage:
requires:
- setup
-
+ windows:
+ jobs:
+ - windows_job
nightly:
triggers:
- schedule:
diff --git a/README.md b/README.md
index 550934987989..8a9d89887480 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,6 @@
-
- 
-
