Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try to fix Windows CI #986

Merged
merged 1 commit into from
Nov 16, 2020
Merged

Conversation

GuillaumeGomez
Copy link
Member

Follow-up of #985.

@GuillaumeGomez GuillaumeGomez force-pushed the windows-ci-fix branch 6 times, most recently from fa44617 to d4c595a Compare November 6, 2020 20:01
@GuillaumeGomez GuillaumeGomez force-pushed the windows-ci-fix branch 2 times, most recently from fc06781 to c97d236 Compare November 6, 2020 20:39
@GuillaumeGomez GuillaumeGomez reopened this Nov 6, 2020
@GuillaumeGomez GuillaumeGomez force-pushed the windows-ci-fix branch 2 times, most recently from f62c423 to 1c85ced Compare November 6, 2020 21:07
Comment on lines 128 to 130
- run: curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
- run: pacman -U --noconfirm --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
- run: pacman --noconfirm -Syu base-devel mingw-w64-${{ matrix.arch }}-toolchain
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- run: curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
- run: pacman -U --noconfirm --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
- run: pacman --noconfirm -Syu base-devel mingw-w64-${{ matrix.arch }}-toolchain
- run: curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
- run: pacman -U --noconfirm --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
- run: pacman --noconfirm -Syu base-devel mingw-w64-${{ matrix.arch }}-toolchain

those are mis-indentended as well

@GuillaumeGomez GuillaumeGomez force-pushed the windows-ci-fix branch 2 times, most recently from 69eb6dd to 66f851b Compare November 6, 2020 21:15
@bilelmoussaoui
Copy link
Member

I think something like this should work

      - name: Install packages from apt
        run: sudo apt install libgtk-3-dev libssh2-1-dev libglib2.0-dev libgraphene-1.0-dev libcairo-gobject2 libcairo2-dev
        if: matrix.os == 'ubuntu-20.04'
      - name: Install toolchain packages with pacman
        run: curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
        if: matrix.os == 'windows-latest'
      - run: curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
        if: matrix.os == 'windows-latest'
      - run: pacman -U --noconfirm --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
        if: matrix.os == 'windows-latest'
      - run: pacman --noconfirm -Syu base-devel mingw-w64-${{ matrix.arch }}-toolchain
        if: matrix.os == 'windows-latest'
      - name: Install library devel packages with pacman
        run: curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
        if: matrix.os == 'windows-latest'
      - run: curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
        if: matrix.os == 'windows-latest'
      - run: pacman -U --noconfirm --config <(echo) msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
        if: matrix.os == 'windows-latest'
      - run: pacman --noconfirm -Syu mingw-w64-${{ matrix.arch }}-gtk3 mingw-w64-${{ matrix.arch }}-libgit2 mingw-w64-${{ matrix.arch }}-libsecret
        if: matrix.os == 'windows-latest'

I didn't notice the if matrix.os=='window-latest' before... I think what would make sense is to split the job into a windows/linux one instead of having a bunch of conditions though

@sdroege
Copy link
Member

sdroege commented Nov 16, 2020

Should we just disable the Windows CI for now here? gir doesn't do anything Windows-specific anyway, it would seem more useful to have a Windows CI for gtk-rs instead.

@GuillaumeGomez
Copy link
Member Author

I will comment out all the windows part. It's just broken beyond recovery and I think it'll be for a while.

@sdroege sdroege merged commit a169b44 into gtk-rs:master Nov 16, 2020
@GuillaumeGomez GuillaumeGomez deleted the windows-ci-fix branch November 16, 2020 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants