Skip to content

Commit

Permalink
master -> main
Browse files Browse the repository at this point in the history
  • Loading branch information
@igagis
igagis committed Nov 18, 2024
1 parent 060f394 commit f89b352
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 51 deletions.
76 changes: 38 additions & 38 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ jobs:
linux_release: bookworm
steps:
- 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/${{ env.linux_release }} llvm-toolchain-${{ env.linux_release }} main
repo-name: llvm
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
install: clang
- 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/${{ env.linux_distro }} ${{ env.linux_release }} main
repo-name: cppfw
keys-asc: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
install: myci locales git pipx
- 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
Expand Down Expand Up @@ -72,22 +72,22 @@ jobs:
matrix:
include:
- {os: debian, codename: bookworm, image_owner: }
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm,docker]}
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm32,docker]}
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
name: sanitizer - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
env:
CXX: clang++
steps:
- 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
install: clang
- 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
Expand All @@ -97,7 +97,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
Expand All @@ -114,21 +114,21 @@ jobs:
include:
# - {os: debian, codename: buster, image_owner: }
# - {os: debian, codename: buster, image_owner: i386/, labels: [i386,docker]}
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm,docker]}
- {os: debian, codename: bullseye, image_owner: }
# - {os: debian, codename: buster, image_owner: arm32v7/, labels: [arm32,docker]}
# - {os: debian, codename: bullseye, image_owner: }
# - {os: debian, codename: bullseye, image_owner: i386/, labels: [i386,docker]}
- {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm,docker]}
- {os: debian, codename: bullseye, image_owner: arm64v8/, labels: [arm64,docker]}
# - {os: debian, codename: bullseye, image_owner: arm32v7/, labels: [arm32,docker]}
# - {os: debian, codename: bullseye, image_owner: arm64v8/, labels: [arm64,docker]}
- {os: debian, codename: bookworm, image_owner: }
# - {os: debian, codename: bookworm, image_owner: i386/, labels: [i386,docker]}
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm,docker]}
- {os: debian, codename: bookworm, image_owner: arm32v7/, labels: [arm32,docker]}
- {os: debian, codename: bookworm, image_owner: arm64v8/, labels: [arm64,docker]}
- {os: ubuntu, codename: focal, image_owner: }
- {os: ubuntu, codename: jammy, image_owner: }
# - {os: ubuntu, codename: focal, image_owner: }
# - {os: ubuntu, codename: jammy, image_owner: }
- {os: ubuntu, codename: noble, image_owner: }
# - {os: raspbian, codename: buster, image_owner: igagis/, labels: [arm,docker]}
- {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm,docker]}
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm,docker]}
# - {os: raspbian, codename: bullseye, image_owner: igagis/, labels: [arm32,docker]}
- {os: raspbian, codename: bookworm, image_owner: igagis/, labels: [arm32,docker]}
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
Expand All @@ -138,23 +138,23 @@ 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 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
install: clang
- 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
- 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
Expand Down Expand Up @@ -193,17 +193,17 @@ jobs:
# run: |
# pacman --sync --refresh --sysupgrade --noconfirm --noprogressbar base-devel git
# - name: add cppfw pacman repo
# uses: myci-actions/add-pacman-repo@master
# uses: myci-actions/add-pacman-repo@main
# with:
# name: cppfw
# url: https://gagis.hopto.org/repo/cppfw/archlinux/${{ matrix.arch }}
# key-server: https://gagis.hopto.org/repo/cppfw/pubkey.gpg
# 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)}
# # makepkg needs to install dependency packages, so nobody user needs sudo rights
# - name: add nobody to sudoers
Expand Down Expand Up @@ -240,24 +240,24 @@ jobs:
ln -s "$(brew --prefix llvm)/bin/clang-tidy" "/usr/local/bin/clang-tidy"
ln -s "$(brew --prefix llvm)/bin/clang-apply-replacements" "/usr/local/bin/clang-apply-replacements"
- name: git clone
uses: myci-actions/checkout@master
uses: myci-actions/checkout@main
- name: add cppfw tap
run: |
brew tap cppfw/tap
brew update
- 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`
Expand Down Expand Up @@ -302,9 +302,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://[email protected]/cppfw/cocoapods-repo.git
Expand Down Expand Up @@ -334,16 +334,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: |
Expand Down Expand Up @@ -377,22 +377,22 @@ 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
shell: 'msys2 {0}'
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 -v $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
- name: build
Expand Down Expand Up @@ -426,7 +426,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
Expand All @@ -436,7 +436,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 }}
Expand Down
16 changes: 8 additions & 8 deletions nuget/build_nuget.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ Get-ChildItem "." -Filter *.in | Foreach-Object{
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v141_Release /p:Platform=x64 /v:minimal /nologo
# If(!$?){exit 1}

msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MD /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Debug_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}
# msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v142_Release_MT /p:Platform=x64 /v:minimal /nologo; If(!$?){exit 1}

msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Debug_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
msbuild /m ../msvs_solution/msvs_solution.sln /t:Rebuild /p:Configuration=v143_Release_MD /p:Platform=x86 /v:minimal /nologo; If(!$?){exit 1}
Expand Down
8 changes: 4 additions & 4 deletions nuget/nuget.autopkg.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ nuget{
title: C++ tml parser library;
authors: {Ivan Gagis};
owners: {Ivan Gagis};
licenseUrl: "https://raw.githubusercontent.com/cppfw/tml/master/LICENSE";
licenseUrl: "https://raw.githubusercontent.com/cppfw/tml/main/LICENSE";
projectUrl: "https://github.com/cppfw/tml";
iconUrl: "https://github.com/cppfw/tml/blob/master/logo.svg";
iconUrl: "https://github.com/cppfw/tml/blob/main/logo.svg";
requireLicenseAcceptance:false;
summary: C++ tml parser library;

Expand Down Expand Up @@ -79,7 +79,7 @@ nuget{
}
*/
// ======== v142 ========

/*
[x86,v142,release,MultiThreaded] {
lib: ..\msvs_solution\v142_Release_MT\tml.lib;
}
Expand All @@ -104,7 +104,7 @@ nuget{
[x64,v142,debug,MultiThreadedDebugDLL] {
lib: ..\msvs_solution\x64\v142_Debug_MD\tml.lib;
}

*/
// ======== v143 ========

[x86,v143,release,MultiThreadedDLL] {
Expand Down
2 changes: 1 addition & 1 deletion wiki/main.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ link:spec.adoc[tml specification]
== Installation
:package_name: tml

. Setup your OS-preferred package system repo following link:https://github.com/cppfw/wiki/blob/master/enable_repo/enable_repo.adoc[this manual]
. Setup your OS-preferred package system repo following link:https://github.com/cppfw/wiki/blob/main/enable_repo/enable_repo.adoc[this manual]
. Install package
+
- **deb** (Linux): `lib{package_name}-dev`
Expand Down

0 comments on commit f89b352

Please sign in to comment.