Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload a Build Artifact
if: startsWith(github.ref, 'refs/tags/')
if: github.event_name == 'pull_request' || startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v7
with:
name: gickup
Expand Down
15 changes: 10 additions & 5 deletions zip/zip.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,24 @@ func Zip(repository string, tozip []string) error {
if err != nil {
return err
}
abspath, err := filepath.Rel(parentDir, path)
if err != nil {
return err
}
abspath = filepath.ToSlash(abspath)
if info.IsDir() {
return nil
// Packed refs can leave refs/ empty, but Git still requires the
// directory to recognize an extracted bare repository.
_, err := w.Create(abspath + "/")
return err
}

file, err := os.Open(path)
if err != nil {
return err
}
defer file.Close()

abspath, err := filepath.Rel(parentDir, path)
if err != nil {
return err
}
f, err := w.Create(abspath)
if err != nil {
return err
Expand Down
87 changes: 87 additions & 0 deletions zip/zip_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ package zip

import (
archivezip "archive/zip"
"context"
"io"
"os"
"os/exec"
"path/filepath"
"strings"
"testing"
)

Expand All @@ -21,6 +24,9 @@ func TestZipCreatesArchiveAndRemovesSources(t *testing.T) {
if err := os.MkdirAll(issuesDir, 0o755); err != nil {
t.Fatalf("mkdir issues: %v", err)
}
if err := os.MkdirAll(filepath.Join(repoDir, "refs", "heads"), 0o755); err != nil {
t.Fatalf("mkdir empty directory: %v", err)
}

if err := os.WriteFile(filepath.Join(repoDir, "README.md"), []byte("repo data"), 0o644); err != nil {
t.Fatalf("write repo file: %v", err)
Expand Down Expand Up @@ -49,6 +55,9 @@ func TestZipCreatesArchiveAndRemovesSources(t *testing.T) {

entries := map[string]string{}
for _, file := range reader.File {
if strings.HasSuffix(file.Name, "/") && !file.FileInfo().IsDir() {
t.Fatalf("entry %q is not marked as a directory", file.Name)
}
opened, err := file.Open()
if err != nil {
t.Fatalf("open entry %s: %v", file.Name, err)
Expand All @@ -70,4 +79,82 @@ func TestZipCreatesArchiveAndRemovesSources(t *testing.T) {
if entries["repo.issues/1.json"] != `{"id":1}` {
t.Fatalf("unexpected issue entry contents: %#v", entries)
}
for _, name := range []string{"repo/", "repo/refs/", "repo/refs/heads/", "repo.issues/"} {
if _, ok := entries[name]; !ok {
t.Errorf("missing directory entry %q", name)
}
}
}

func TestZipRestoresBareRepositoryWithPackedRefs(t *testing.T) {
t.Parallel()
if _, err := exec.LookPath("git"); err != nil {
t.Skip("git is required for the restore test")
}
root := t.TempDir()
runGit := func(args ...string) string {
t.Helper()
cmd := exec.CommandContext(context.TODO(), "git", args...)
cmd.Env = append(os.Environ(), "GIT_CONFIG_NOSYSTEM=1", "GIT_CONFIG_GLOBAL="+os.DevNull)
out, err := cmd.CombinedOutput()
if err != nil {
t.Fatalf("git %v: %v\n%s", args, err, out)
}
return strings.TrimSpace(string(out))
}
source := filepath.Join(root, "source")
repo := filepath.Join(root, "repo.git")
runGit("init", "--initial-branch=main", source)
runGit("-C", source, "-c", "user.name=Test", "-c", "user.email=test@example.invalid", "-c", "commit.gpgsign=false", "commit", "--allow-empty", "-m", "test")
runGit("-C", source, "tag", "v1")
runGit("clone", "--mirror", source, repo)
runGit("-C", repo, "pack-refs", "--all", "--prune")
wantRefs := runGit("-C", repo, "show-ref")
for _, name := range []string{"heads", "tags"} {
entries, err := os.ReadDir(filepath.Join(repo, "refs", name))
if err != nil || len(entries) != 0 {
t.Fatalf("expected empty refs/%s before archiving, got %v, %v", name, entries, err)
}
}
if err := Zip(repo, []string{repo}); err != nil {
t.Fatal(err)
}
reader, err := archivezip.OpenReader(repo + ".zip")
if err != nil {
t.Fatal(err)
}
defer reader.Close()
restoreDir := filepath.Join(root, "restored")
for _, entry := range reader.File {
dest := filepath.Join(restoreDir, filepath.FromSlash(entry.Name))
if entry.FileInfo().IsDir() {
if err := os.MkdirAll(dest, 0o755); err != nil {
t.Fatal(err)
}
continue
}
if err := os.MkdirAll(filepath.Dir(dest), 0o755); err != nil {
t.Fatal(err)
}
r, err := entry.Open()
if err != nil {
t.Fatal(err)
}
data, err := io.ReadAll(r)
r.Close()
if err != nil {
t.Fatal(err)
}
if err := os.WriteFile(dest, data, 0o644); err != nil {
t.Fatal(err)
}
}
restored := filepath.Join(restoreDir, "repo.git")
if got := runGit("-C", restored, "rev-parse", "--is-bare-repository"); got != "true" {
t.Fatalf("restored repository is not bare: %s", got)
}
runGit("-C", restored, "fsck", "--full")
if got := runGit("-C", restored, "show-ref"); got != wantRefs {
t.Fatalf("restored refs = %q, want %q", got, wantRefs)
}
}
Loading