Remove Windows from self-test for now

ferrocene · Jun 20, 2024 · 977e352 · 977e352
1 parent 4d7c181
commit 977e352
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/.circleci/calculate-parameters.py b/.circleci/calculate-parameters.py
@@ -62,7 +62,7 @@
 
 # Tagets only built (and tested!) on Windows
 WINDOWS_ONLY_TARGETS = ["x86_64-pc-windows-msvc"]
-X86_64_WINDOWS_ALL_TARGETS = WINDOWS_ONLY_TARGETS + X86_64_LINUX_BUILT_CROSS_TARGETS + QNX_TARGETS
+X86_64_WINDOWS_ALL_TARGETS = WINDOWS_ONLY_TARGETS + X86_64_LINUX_BUILT_CROSS_TARGETS
 
 s3 = boto3.client("s3", region_name=S3_REGION)
 ecr = boto3.client("ecr", region_name=ECR_REGION)

diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
@@ -484,7 +484,6 @@ jobs:
           depth: 1
       - aws-oidc-auth
       - ferrocene-setup-windows
-      - setup-qnx-toolchain: {}
       - run:
           name: Download dist artifacts and run the self-test tool
           command: ferrocene/ci/scripts/run-self-test.sh

diff --git a/ferrocene/doc/user-manual/src/targets/aarch64-unknown-nto-qnx710.rst b/ferrocene/doc/user-manual/src/targets/aarch64-unknown-nto-qnx710.rst
@@ -11,8 +11,12 @@ ARMv8-A processors operating in Aarch64 mode.
 
 .. note::
 
-    QNX only supports :ref:`x86_64-unknown-linux-gnu` and
+   QNX SDP only supports :ref:`x86_64-unknown-linux-gnu` and
     :ref:`x86_64-pc-windows-msvc` as host platforms.
+
+    Currently, Ferrocene only tests cross compiling from :ref:`x86_64-unknown-linux-gnu`
+    to :target:`aarch64-unknown-nto-qnx710`. Compiling from :ref:`x86_64-pc-windows-msvc`
+    will be supported in the future.
 
     QNX does not support :ref:`aarch64-apple-darwin` as a host platform. QNX is
     deprecating support for :target:`x86_64-apple-darwin` as a host platform.

diff --git a/ferrocene/doc/user-manual/src/targets/index.rst b/ferrocene/doc/user-manual/src/targets/index.rst
@@ -106,13 +106,13 @@ should not be used in production.
      - ``aarch64-unknown-nto-qnx710``
      - Cross-compilation
      - Full
-     - Can only be cross-compiled from :ref:`x86_64-unknown-linux-gnu` and :ref:`x86_64-pc-windows-msvc`.
+     - Can only be cross-compiled from :ref:`x86_64-unknown-linux-gnu`.
 
    * - :ref:`x86_64-pc-nto-qnx710`
      - ``x86_64-pc-nto-qnx710``
      - Cross-compilation
      - Full
-     - Can only be cross-compiled from :ref:`x86_64-unknown-linux-gnu` and :ref:`x86_64-pc-windows-msvc`.
+     - Can only be cross-compiled from :ref:`x86_64-unknown-linux-gnu`.
 
    * - :target:`wasm32-unknown-unknown`
      - ``wasm32-unknown-unknown``

diff --git a/ferrocene/doc/user-manual/src/targets/x86_64-pc-nto-qnx710.rst b/ferrocene/doc/user-manual/src/targets/x86_64-pc-nto-qnx710.rst
@@ -11,8 +11,12 @@ x86-64 processors.
 
 .. note::
 
-    QNX only supports :ref:`x86_64-unknown-linux-gnu` and
+    QNX SDP only supports :ref:`x86_64-unknown-linux-gnu` and
     :ref:`x86_64-pc-windows-msvc` as host platforms.
+
+    Currently, Ferrocene only tests cross compiling from :ref:`x86_64-unknown-linux-gnu`
+    to :target:`x86_64-pc-nto-qnx710`. Compiling from :ref:`x86_64-pc-windows-msvc`
+    will be supported in the future.
 
     QNX does not support :ref:`aarch64-apple-darwin` as a host platform. QNX is
     deprecating support for :target:`x86_64-apple-darwin` as a host platform.