Skip to content

Commit 3931ee0

Browse files
committed
feat: change pkg.deepin.io to github.com
pkg.deepin.io 是内部使用的域名 Log: Influence: no Change-Id: I780112a49dc8c7275fd5c035b55f0691a9c567d7
1 parent 692f7ac commit 3931ee0

11 files changed

+63
-20
lines changed

.github/workflows/generator.yaml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: CI Build
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
generator:
10+
name: auto generator
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
- uses: actions/setup-go@v2
15+
with:
16+
go-version: '^1.17'
17+
- name: install build-dep
18+
run: |
19+
sudo apt install -y libgirepository1.0-dev libgudev-1.0-dev
20+
- name: build
21+
run: make
22+
- name: init git
23+
env:
24+
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
25+
run: |
26+
git config --global user.email "[email protected]"
27+
git config --global user.name "justforlxz"
28+
git clone https://x-access-token:[email protected]/linuxdeepin/go-gir.git
29+
- name: copy file
30+
run: |
31+
rm -rf go-gir/*
32+
cp -r out/src/github.com/linuxdeepin/go-gir/* go-gir/
33+
- name: add files
34+
run: |
35+
git add .
36+
git commit -m "auto generator at $date"
37+
- name: push
38+
run: |
39+
git push -f

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PREFIX = /usr
22
GOBUILD = go build
33
GOTEST = go build
44
GORUN = go run
5-
OUT_GIR_DIR = out/src/pkg.deepin.io/gir/
5+
OUT_GIR_DIR = out/src/github.com/linuxdeepin/go-gir/
66
export GO111MODULE=off
77

88
all: build
@@ -12,7 +12,7 @@ export GOPATH = $(CURDIR):$(CURDIR)/vendor:$(CURDIR)/out
1212

1313
GENERATOR = out/gir-generator
1414

15-
build: glib-2.0 gobject-2.0 gio-2.0 gudev-1.0 copyfile
15+
build: glib-2.0 gobject-2.0 gio-2.0 gudev-1.0 copyfile
1616

1717
generator:
1818
mkdir -p $(OUT_GIR_DIR)
@@ -45,8 +45,8 @@ test:
4545
${GORUN} test/memory.go
4646

4747
install:
48-
install -d $(DESTDIR)$(PREFIX)/share/gocode/src/pkg.deepin.io/gir $(DESTDIR)$(PREFIX)/bin
49-
cp -r $(OUT_GIR_DIR)* $(DESTDIR)$(PREFIX)/share/gocode/src/pkg.deepin.io/gir
48+
install -d $(DESTDIR)$(PREFIX)/share/gocode/src/github.com/linuxdeepin/go-gir $(DESTDIR)$(PREFIX)/bin
49+
cp -r $(OUT_GIR_DIR)* $(DESTDIR)$(PREFIX)/share/gocode/src/github.com/linuxdeepin/go-gir
5050
cp out/gir-generator $(DESTDIR)$(PREFIX)/bin/
5151

5252
clean:

debian/golang-gir-gio-2.0-dev.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/share/gocode/src/pkg.deepin.io/gir/gio-2.0
1+
usr/share/gocode/src/github.com/linuxdeepin/go-gir/gio-2.0
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/share/gocode/src/pkg.deepin.io/gir/glib-2.0
1+
usr/share/gocode/src/github.com/linuxdeepin/go-gir/glib-2.0
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/share/gocode/src/pkg.deepin.io/gir/gobject-2.0
1+
usr/share/gocode/src/github.com/linuxdeepin/go-gir/gobject-2.0
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
usr/share/gocode/src/pkg.deepin.io/gir/gudev-1.0
1+
usr/share/gocode/src/github.com/linuxdeepin/go-gir/gudev-1.0

lib.in/gio-2.0/gdk_workaround.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ package gio
55
// void free(void*);
66
// #cgo pkg-config: gdk-3.0
77
import "C"
8-
import "unsafe"
9-
import "pkg.deepin.io/gir/gobject-2.0"
8+
import (
9+
"unsafe"
10+
11+
"github.com/linuxdeepin/go-gir/gobject-2.0"
12+
)
1013

1114
type GdkAppLaunchContext struct {
1215
AppLaunchContext

lib.in/gio-2.0/gio.go.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import "C"
1313
import "unsafe"
1414

1515
import (
16-
"pkg.deepin.io/gir/gobject-2.0"
17-
"pkg.deepin.io/gir/glib-2.0"
16+
"github.com/linuxdeepin/go-gir/gobject-2.0"
17+
"github.com/linuxdeepin/go-gir/glib-2.0"
1818
)
1919

2020
[<.go_utils>]

lib.in/gudev-1.0/gudev.go.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import "C"
1111
import "unsafe"
1212

1313
import (
14-
"pkg.deepin.io/gir/gobject-2.0"
14+
"github.com/linuxdeepin/go-gir/gobject-2.0"
1515
)
1616

1717
[<.go_utils_no_cb>]

rpm/go-gir-generator.spec

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Provides: golang(gir/gobject-2.0)
2727
Provides: golang(gir/gio-2.0)
2828
Provides: golang(gir/glib-2.0)
2929
Provides: golang(gir/gudev-1.0)
30-
Provides: pkgconfig(pkg.deepin.io/gir/gio-2.0)
30+
Provides: pkgconfig(github.com/linuxdeepin/go-gir/gio-2.0)
3131
Provides: deepin-gir-generator
3232

3333
%description
@@ -55,7 +55,7 @@ export GOPATH="%{gopath}"
5555
%doc README.md
5656
%license LICENSE
5757
%{_bindir}/gir-generator
58-
%{gopath}/src/pkg.deepin.io/gir/
58+
%{gopath}/src/github.com/linuxdeepin/go-gir/
5959

6060
%changelog
6161
* Thu Mar 23 2021 uoser <[email protected]> - 2.0.5-1

test/memory.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package main
22

33
import (
4-
"pkg.deepin.io/gir/gio-2.0"
4+
"fmt"
5+
"os"
56
"runtime"
67
"strings"
8+
"syscall"
9+
"time"
10+
11+
"github.com/linuxdeepin/go-gir/gio-2.0"
712
)
8-
import "time"
9-
import "syscall"
10-
import "fmt"
11-
import "os"
1213

1314
func RSSinMB() int {
1415
var r syscall.Rusage

0 commit comments

Comments
 (0)