diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fafce67..7db04aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,14 +24,14 @@ jobs: name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }} | ${{ matrix.labels[0] }} steps: - name: add cppfw deb repo - uses: myci-actions/add-deb-repo@master + uses: myci-actions/add-deb-repo@main with: repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main repo-name: cppfw keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg install: myci git - name: add llvm repo (for clang-format) - uses: myci-actions/add-deb-repo@master + uses: myci-actions/add-deb-repo@main with: repo: deb https://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main repo-name: llvm @@ -40,7 +40,7 @@ jobs: run: | apt install --assume-yes devscripts equivs - name: git clone - uses: myci-actions/checkout@master + uses: myci-actions/checkout@main - name: prepare debian package run: myci-deb-prepare.sh - name: install deps @@ -81,22 +81,22 @@ jobs: # configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal) TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - name: add cppfw deb repo - uses: myci-actions/add-deb-repo@master + uses: myci-actions/add-deb-repo@main with: repo: deb https://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main repo-name: cppfw keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg install: myci git devscripts equivs nodejs - name: add llvm repo (for clang-format) - uses: myci-actions/add-deb-repo@master + uses: myci-actions/add-deb-repo@main with: repo: deb https://apt.llvm.org/${{ matrix.codename }} llvm-toolchain-${{ matrix.codename }} main repo-name: llvm keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key - name: git clone - uses: myci-actions/checkout@master + uses: myci-actions/checkout@main - name: set PACKAGE_VERSION - uses: myci-actions/export-env-var@master + uses: myci-actions/export-env-var@main with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)} - name: prepare debian package run: myci-deb-prepare.sh @@ -130,7 +130,7 @@ jobs: rm -rf /usr/local/bin/python3* rm -rf /usr/local/bin/python3*-config - name: git clone - uses: myci-actions/checkout@master + uses: myci-actions/checkout@main - name: install clang-tidy and clang-format run: | brew install llvm @@ -144,16 +144,16 @@ jobs: - name: install ci tools run: brew install myci make - name: set PATH to use latest make - uses: myci-actions/export-env-var@master + uses: myci-actions/export-env-var@main with: {name: PATH, value: "$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$PATH"} - name: set CFLAGS - uses: myci-actions/export-env-var@master + uses: myci-actions/export-env-var@main with: {name: CFLAGS, value: "-isystem $HOMEBREW_PREFIX/include $CFLAGS"} - name: set CXXFLAGS - uses: myci-actions/export-env-var@master + uses: myci-actions/export-env-var@main with: {name: CXXFLAGS, value: "-isystem $HOMEBREW_PREFIX/include $CXXFLAGS"} - name: set LDFLAGS - uses: myci-actions/export-env-var@master + uses: myci-actions/export-env-var@main with: {name: LDFLAGS, value: "-L $HOMEBREW_PREFIX/lib $LDFLAGS"} - name: install deps run: myci-brew-install.sh `myci-list-deps-homebrew.sh` @@ -184,9 +184,9 @@ jobs: - name: install ci tools run: brew install myci - name: git clone - uses: myci-actions/checkout@master + uses: myci-actions/checkout@main - name: set PACKAGE_VERSION - uses: myci-actions/export-env-var@master + uses: myci-actions/export-env-var@main with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)} - name: add cocoapods repo run: pod repo add --silent cppfw https://$MYCI_GIT_USERNAME@github.com/cppfw/cocoapods-repo.git @@ -216,16 +216,16 @@ jobs: container: mingc/android-build-box:latest steps: - name: git clone - uses: myci-actions/checkout@master + uses: myci-actions/checkout@main - name: add cppfw deb repo - uses: myci-actions/add-deb-repo@master + uses: myci-actions/add-deb-repo@main with: repo: deb https://gagis.hopto.org/repo/cppfw/$(lsb_release --id --short | tr '[:upper:]' '[:lower:]') $(lsb_release --codename --short) main repo-name: cppfw keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg install: myci - name: set PACKAGE_VERSION - uses: myci-actions/export-env-var@master + uses: myci-actions/export-env-var@main with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)} - name: build run: | @@ -259,7 +259,7 @@ jobs: msys2-devel mingw-w64-${{ matrix.arch }}-toolchain - name: add cppfw pacman msys repo - uses: myci-actions/add-pacman-repo@master + uses: myci-actions/add-pacman-repo@main with: name: cppfw_msys url: https://gagis.hopto.org/repo/cppfw/msys2/msys @@ -267,14 +267,14 @@ jobs: key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg install: myci - name: add cppfw pacman msys/mingw repo - uses: myci-actions/add-pacman-repo@master + uses: myci-actions/add-pacman-repo@main with: name: cppfw_${{ matrix.repo }} url: https://gagis.hopto.org/repo/cppfw/msys2/${{ matrix.repo }} shell: 'msys2 {0}' key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg - name: git clone - uses: myci-actions/checkout@master + uses: myci-actions/checkout@main - name: prepare pacman package run: myci-apply-version.sh --version $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in - name: build @@ -300,7 +300,7 @@ jobs: - name: git clone uses: actions/checkout@v3 - name: install CoAPP tools - uses: myci-actions/install-coapp-tools@master + uses: myci-actions/install-coapp-tools@main - name: nuget update run: | nuget restore msvs_solution/msvs_solution.sln @@ -310,7 +310,7 @@ jobs: - name: build run: .\nuget\build_nuget.ps1 - name: deploy - uses: myci-actions/publish-nuget@master + uses: myci-actions/publish-nuget@main with: filename: '.\nuget\*.nupkg' api-key: ${{ secrets.NUGET_DOT_ORG_API_KEY }} diff --git a/.gitmodules b/.gitmodules index 644844b..829d762 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "tool-configs"] path = tool-configs url = ../../cppfw/tool-configs + branch = main diff --git a/nuget/nuget.autopkg.in b/nuget/nuget.autopkg.in index c6c4520..0b18bf7 100644 --- a/nuget/nuget.autopkg.in +++ b/nuget/nuget.autopkg.in @@ -18,9 +18,9 @@ nuget{ title: Intrusive C++ GUI library; authors: {Ivan Gagis}; owners: {Ivan Gagis}; - licenseUrl: "https://raw.githubusercontent.com/cppfw/ruisapp/master/LICENSE"; + licenseUrl: "https://raw.githubusercontent.com/cppfw/ruisapp/main/LICENSE"; projectUrl: "https://github.com/cppfw/ruisapp"; - iconUrl: "https://github.com/cppfw/ruisapp/blob/master/logo.svg"; + iconUrl: "https://github.com/cppfw/ruisapp/blob/main/logo.svg"; requireLicenseAcceptance:false; summary: C++ GUI library; diff --git a/tool-configs b/tool-configs index 77ac560..5ae4631 160000 --- a/tool-configs +++ b/tool-configs @@ -1 +1 @@ -Subproject commit 77ac56047405a2184f9ceed6e91f67bcd01a297a +Subproject commit 5ae463168087816fd3db83a5450cc9dafc35553d diff --git a/wiki/Installation.adoc b/wiki/Installation.adoc index a657f28..f90cff7 100644 --- a/wiki/Installation.adoc +++ b/wiki/Installation.adoc @@ -1,7 +1,7 @@ = Istallation :package_name: ruisapp -. Setup your OS-preferred package system repo following link:https://github.com/cppfw/wiki/blob/master/EnableRepo.adoc[this manual] +. Setup your OS-preferred package system repo following link:https://github.com/cppfw/wiki/blob/main/EnableRepo.adoc[this manual] . Install package + - **deb** (Linux): `lib{package_name}-dev`