Commit Graph

43 Commits

Author SHA1 Message Date
ssrlive
84fba0ed4f minor 2022-09-21 22:40:36 +08:00
ssrlive
c60026ecbe Merge https://github.com/mchehab/zbar.git 2022-09-21 16:23:00 +08:00
a1346054
093aa5df6b debuilder.sh: use commas where needed
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2022-05-29 18:32:43 +02:00
a1346054
9037004f22 Several files: fix whitespace
* trim trailing whitespace
* trim excess whitespace
* indentation

Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
2022-05-29 18:31:57 +02:00
ssrlive
7d0255f153
Update cmake.yml 2021-10-14 02:16:22 +08:00
ssrlive
af4b4f37e2
Update cmake.yml 2021-10-14 01:41:31 +08:00
ssrlive
342764958b
Update cmake.yml 2021-10-14 01:24:17 +08:00
ssrlive
715cabe675
Update ci.yml 2021-10-12 11:02:51 +08:00
ssrlive
fa9d18ae5d
Update cmake.yml 2021-10-11 13:01:08 +08:00
ssrlive
29f0ed1d44
m (#1)
CI fixing.
2021-10-11 08:40:26 +08:00
ssrlive
0e5abcf649
Update ci.yml 2021-10-11 06:34:21 +08:00
ssrlive
88ccf24250
Create debuilder.sh 2021-10-11 06:27:42 +08:00
ssrlive
1fa66b31e0
Create ci.yml 2021-10-11 05:12:02 +08:00
ssrlive
054af5e4c9
Create cmake.yml 2021-10-10 21:20:51 +08:00
Mauro Carvalho Chehab
b337eea402 workflows: ci: use Ubuntu 18.04 for gtk2
With ubuntu latest, python gtk2 dev package is not found
anymore:

	E: Unable to locate package python-gtk2-dev

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-03-14 17:27:36 +01:00
Mauro Carvalho Chehab
15adf065b5 workflows: add an action for doing Coverity static analysis
Let's automate a task to run Coverity for this project.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-21 15:20:16 +01:00
Mauro Carvalho Chehab
bf250bae01 workflows: on_release: fix Ubuntu build logic
The logic which generates the tarball and uploads it is wrong.

Fix it.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-21 13:13:17 +01:00
Mauro Carvalho Chehab
5c2bc39463 workflows: use the modified update-release-asset
The upstream version is lacking a maintainer. So, let's use
a version from my own repository, with has all packages updated
and works fine when called via workflow_dispatch.

With that, we can get rid of an attempt to write a logic
like that, half-implemented under update_release.yml.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-21 10:35:14 +01:00
Mauro Carvalho Chehab
029f04032c workflows: on_release: fix Ubuntu build
echo "OS_VERSION=$OS_VERSION" >> $GITHUB_ENV

doesn't work. hardcode the OS_VERSION.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-16 16:43:50 +01:00
Mauro Carvalho Chehab
8ae37ff601 workflows: add a test update release
This script is not complete, but it seems that the only way
for a new script to be tested is to have it merged first
at master. So, later patches will fix any issues that it
may have.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-16 12:57:53 +01:00
Mauro Carvalho Chehab
f2b6892841 workflows: use static libraries on Windows
At least on Windows, it is a good idea to use static libraries,
in order to not depend on libMagickWand7*.dll.

See: https://github.com/mchehab/zbar/issues/56#issuecomment-779438952

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-16 12:57:47 +01:00
Mauro Carvalho Chehab
1d409c802f workflows: ci: avoid creating duplicate CI events
When there is a PR and a push happens, two events doing the same
thing is triggered. Fix that.

While here, drop the manual even trigger. It is useless, as it
will just repeat the same task from the same push.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-16 12:34:28 +01:00
Mauro Carvalho Chehab
1688aea943 workflows: on_tag: create new releases as pre-releases
In order to avoid triggering actions on other projects,
tag the new releases as pre-releases.

This will be manually overrided after the release
creation.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-16 11:02:00 +01:00
Mauro Carvalho Chehab
ffe346262c workflows: ci: use the new debuild-based script
Instead of using pbuilder, let's use the same script that
will be used to generate a release.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-14 12:35:55 +01:00
Mauro Carvalho Chehab
760b22a404 workflows: on_release: Fic some issues at the debuilder script
Ubuntu 18.04 (ubuntu-latest) is older than
debhelper-compat (= 12). While we could change it, as
ubuntu-latest will soon be upgraded to point to ubuntu-20.04,
let's just use it instead.

While here, do some minor improvements at the build procedure.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-14 12:35:33 +01:00
Mauro Carvalho Chehab
f6d4cb975f workflows: on_release: use debuild instead of pbuilder
While pbuilder helps to solve some things and to create a
clean build environment, the current procedure has some
issues with regards to version numbering: basically, it
expects that the ZBar version to be the one from the Ubuntu
repository (0.23.1).

While this is ok for CI bots, it will cause issues if minor
changes. The package names will also be weird.

So, let's use debuild instead. This requires a small trick,
though:

dh_shlibdeps will start complaing for each new symbol, due to
SONAME debian rules. So, we need to patch debian rules to
make it ignore them.

Also, the script needs to ensure that the same version number
as defined at configure.ac will be at debian/changelog.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-14 11:14:17 +01:00
Mauro Carvalho Chehab
6b2fb24028 workflows: create_binaries: auto-create a release
Instead of creating the release manually, add its creation
logic to be built inside the workflow.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-13 20:25:05 +01:00
Mauro Carvalho Chehab
a19afb5c8a workflows: allow to manually trigger them
It is very hard to develop a workflow if it can't be manually
trigged. That's specially interesting for release workflows.

So, add an option to be able to manually trigger them via
GUI.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-13 13:08:57 +01:00
Mauro Carvalho Chehab
daa640d87a workflows: add a job to create binaries
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-13 13:08:57 +01:00
Mauro Carvalho Chehab
0356e9f9e2 workflows: ci: macos: simplify the configure line
There's no need to add some configure options here, as
configure should be able to auto-detect them.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 18:45:26 +01:00
Mauro Carvalho Chehab
9837f0dd91 workflows: ci: windows: add python, iconv and imagemagick
add more msys2 packages.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 18:45:26 +01:00
Mauro Carvalho Chehab
cf75ca3a94 workflows: ci: cleanup Mingw targets
Split into two jobs, in order to allow running it in parallel,
and cleanup the steps names.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 18:45:26 +01:00
Mauro Carvalho Chehab
deb2a7bd26 workflows: ci: don't limit branches for CI builds
There's no need for CI builds to happen only against master

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 16:08:16 +01:00
Mauro Carvalho Chehab
bbd5601a36 workflows: add support for build with and without DShow
Change the Windows matrix for it to generate ZBar with
4 different environments:
	- i386, VfW
	- i386, DShow
	- x86_64, VfW
	- x86_64, DShow

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 14:54:20 +01:00
Mauro Carvalho Chehab
7d6da81756 workflows: build also for Windows i386
Add another arch at the build matrix, in order to use
Mingw 32 bits.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 14:45:20 +01:00
Mauro Carvalho Chehab
7709de4cc3 workflows: add a target to build on Windows natively
Just like Windows.pc travis target, add a similar feature
at the CI action.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 14:42:55 +01:00
Mauro Carvalho Chehab
82e443d519 workflows: integrate Ubuntu builder at common CI file
While it is easier to develop it in separate, let's merge
to a single CI file, as this helps maintaing it.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 12:56:50 +01:00
Mauro Carvalho Chehab
2952916db8 workflows: add Debian SID pbuilder action
Implement a build similar to the one at travis/linux.debian-sid.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 12:50:05 +01:00
Mauro Carvalho Chehab
75d652a47f workflows: consolidate all CI actions into a single file
Instead of keeping one action per target, place them on a common
file.

That makes easier to maintain and to see the status once the
action runs.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 12:33:02 +01:00
Mauro Carvalho Chehab
f495db34de workflows: add a Mac OS action
Based on travis osx.mac scripts

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 12:28:10 +01:00
Mauro Carvalho Chehab
f97e8ac945 workflows: add a mingw-w64 action (built via Ubuntu)
similar to travis mingw-w64 target

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-12 12:28:10 +01:00
Mauro Carvalho Chehab
3a5573b966 Add a github workflow with Gtk2 on Ubuntu
This workflow is similar to travis/linux.ubuntu-gtk2 one.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-11 16:50:25 +01:00
Mauro Carvalho Chehab
812b583920 Add a github workflow with Qt5, Gtk3 and Python3 on Ubuntu
This workflow is similar to travis/linux.ubuntu-gtk3 one.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
2021-02-11 16:50:25 +01:00