try again

bradh352 · Dec 12, 2024 · 9fb50d7 · 9fb50d7
1 parent 33c981c
commit 9fb50d7
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/qnx.yml b/.github/workflows/qnx.yml
@@ -31,21 +31,21 @@ jobs:
       # Logic for intalling SDP taken right out of https://github.com/qnx-ports/build-files/blob/main/.github/workflows/c-ares.yml
       - name: Download SDP 8.0
         env:
-          LICENSE_KEY: ${{ secrets.LICENSE_KEY }}
-          MYQNX_USER: ${{ secrets.MYQNX_USER }}
-          MYQNX_PASSWORD: ${{ secrets.MYQNX_PASSWORD }}
+          QNX_LICENSE_KEY: ${{ secrets.QNX_LICENSE_KEY }}
+          QNX_USER: ${{ secrets.QNX_USER }}
+          QNX_PASSWORD: ${{ secrets.QNX_PASSWORD }}
         run: |
           echo "Downloading QNX Software Center ..."
           mkdir ${{ github.workspace }}/.qnx
-          curl --cookie-jar ${{ github.workspace }}/.qnx/myqnxcookies.auth --form "userlogin=$MYQNX_USER" --form "password=$MYQNX_PASSWORD" -X POST https://www.qnx.com/account/login.html > login_response.html
+          curl --cookie-jar ${{ github.workspace }}/.qnx/myqnxcookies.auth --form "userlogin=$QNX_USER" --form "password=$QNX_PASSWORD" -X POST https://www.qnx.com/account/login.html > login_response.html
           curl -L --cookie ${{ github.workspace }}/.qnx/myqnxcookies.auth https://www.qnx.com/download/download/77351/qnx-setup-2.0.3-202408131717-linux.run > qnx-setup-lin.run
           chmod a+x qnx-setup-lin.run
           ./qnx-setup-lin.run force-override disable-auto-start agree-to-license-terms ${{ github.workspace }}/qnxinstall
           echo "Installing License ..."
-          ${{ github.workspace }}/qnxinstall/qnxsoftwarecenter/qnxsoftwarecenter_clt -syncLicenseKeys -myqnx.user="$MYQNX_USER" -myqnx.password="$MYQNX_PASSWORD" -addLicenseKey $LICENSE_KEY
+          ${{ github.workspace }}/qnxinstall/qnxsoftwarecenter/qnxsoftwarecenter_clt -syncLicenseKeys -myqnx.user="$QNX_USER" -myqnx.password="$QNX_PASSWORD" -addLicenseKey $QNX_LICENSE_KEY
           cp -r ~/.qnx/license ${{ github.workspace }}/.qnx
           echo "Downloading QNX SDP ..."
-          ${{ github.workspace }}/qnxinstall/qnxsoftwarecenter/qnxsoftwarecenter_clt -mirror -cleanInstall -destination ${{ github.workspace }}/qnx800 -installBaseline com.qnx.qnx800 -myqnx.user="$MYQNX_USER" -myqnx.password="$MYQNX_PASSWORD"
+          ${{ github.workspace }}/qnxinstall/qnxsoftwarecenter/qnxsoftwarecenter_clt -mirror -cleanInstall -destination ${{ github.workspace }}/qnx800 -installBaseline com.qnx.qnx800 -myqnx.user="$QNX_USER" -myqnx.password="$QNX_PASSWORD"
       - name: Checkout googletest
         uses: actions/checkout@v4
         with:
@@ -59,7 +59,7 @@ jobs:
         run: |
           source "${{ github.workspace }}/qnx800/qnxsdp-env.sh"
           cd googletest
-          cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_STAGING_PREFIX=${QNX_TARGET}/x86_64/usr -DCMAKE_INSTALL_INCLUDEDIR=${QNX_TARGET}/usr/include -DCMAKE_FIND_ROOT_PATH="${CMAKE_FIND_ROOT_PATH}" -DBUILD_GMOCK=ON -DINSTALL_GTEST=ON -Dgtest_disable_pthreads=ON -DCMAKE_VERBOSE_MAKEFILE=ON .
+          cmake -DCMAKE_SYSTEM_NAME=QNX -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_INCLUDEDIR=${QNX_TARGET}/usr/include -DCMAKE_FIND_ROOT_PATH="${CMAKE_FIND_ROOT_PATH}" -DBUILD_GMOCK=ON -DINSTALL_GTEST=ON -Dgtest_disable_pthreads=ON -DCMAKE_VERBOSE_MAKEFILE=ON .
           gmake
           gmake install
       - name: Checkout c-ares