Skip to content
Snippets Groups Projects
  1. Feb 28, 2022
    • George Joseph's avatar
      build: Refactor the earlier "basebranch" commit · 1950cec3
      George Joseph authored
      Recap from earlier commit:  If you have a development branch for a
      major project that will receive gerrit reviews it'll probably be
      named something like "development/16/newproject" or a work branch
      based on that "development" branch.  That will necessitate
      setting "defaultbranch=development/16/newproject" in .gitreview.
      The make_version script uses that variable to construct the
      asterisk version however, which results in versions
      like "GIT-development/16/newproject-ee582a8c7b" which is probably
      not what you want.  It also constructs the URLs for downloading
      external modules with that version, which will fail.
      
      Fast-forward:
      
      The earlier attempt at adding a "basebranch" variable to
      .gitreview didn't work out too well in practice because changes
      were made to .gitreview, which is a checked-in file.  So, if
      you wanted to rebase your work branch on the base branch, rebase
      would attempt to overwrite your .gitreview with the one from
      the base branch and complain about a conflict.
      
      This is a slighltly different approach that adds three methods to
      determine the mainline branch:
      
      1.  --- MAINLINE_BRANCH from the environment
      
      If MAINLINE_BRANCH is already set in the environment, that will
      be used.  This is primarily for the Jenkins jobs.
      
      2.  --- .develvars
      
      Instead of storing the basebranch in .gitreview, it can now be
      stored in a non-checked-in ".develvars" file and keyed by the
      current branch.  So, if you were working on a branch named
      "new-feature-work" based on "development/16/new-feature" and wanted
       to push to that branch in Gerrit but wanted to pull the external
       modules for 16, you'd create the following .develvars file:
      
      [branch "new-feature-work"]
          mainline-branch = 16
      
      The .gitreview file would still look like:
      
      [gerrit]
      defaultbranch=development/16/new-feature
      
      ...which would cause any reviews pushed from "new-feature-work" to
      go to the "development/16/new-feature" branch in Gerrit.
      
      The key is that the .develvars file is NEVER checked in (it's been
      added to .gitignore).
      
      3.  --- Well Known Development Branch
      
      If you're actually working in a branch named like
      "development/<mainline_branch>/some-feature", the mainline branch
      will be parsed from it.
      
      4.  --- .gitreview
      
      If none of the earlier conditions exist, the .gitreview
      "defaultbranch" variable will be used just as before.
      
      Change-Id: I1cdeeaa0944bba3f2e01d7a2039559d0c266f8c9
      1950cec3
  2. Jul 11, 2018
    • George Joseph's avatar
      CI: Initial commit for moving CI into source repo · b302ee6b
      George Joseph authored
      Create tests/CI directory and add files used by Jenkins to
      build and test Asterisk.
      
      With this commit, Jenkins will run the Asterisk Unit Tests using
      the Jenkinsfile at tests/CI/unittests.jenkinsfile.  Bash scripts
      to do the actual building and testing are also in the same directory.
      Output is placed in tests/CI/output so that directory has been
      added to .gitignore.
      
      Change-Id: I9448065465e6de2b878634510ace8fd1ef378608
      b302ee6b
  3. May 09, 2018
    • Corey Farrell's avatar
      git: Ignore *.orig. · 2e376849
      Corey Farrell authored
      This prevents accidental commit of files created by patch.
      
      Change-Id: I68380db61f0f9d620046f719ccd978811d0e9964
      2e376849
  4. Jan 11, 2018
  5. Mar 17, 2016
    • Leif Madsen's avatar
      Add initial support to build Docker images · 0da36fca
      Leif Madsen authored
      This work-in-progress is the first step to being able to reliably
      build Asterisk containers from the Asterisk source. I'm submitting
      this based on feedback gained at AstriDevCon 2015.
      
      Information about how to use this is provided in contrib/docker/README.md
      and will result in a local Asterisk container being built right from
      your source. I believe this can eventually be automated via
      hub.docker.com.
      
      Change-Id: Ifa070706d40e56755797097b6ed72c1e243bd0d1
      0da36fca
  6. May 08, 2015
    • George Joseph's avatar
      doc: Make progdocs play nice with git · cf637f25
      George Joseph authored
      Moved contrib/asterisk-ng-doxygen to doc/asterisk-ng-doxygen.in
      
      Changed /Makefile to copy asterisk-ng-doxygen.in to
      asterisk-ng-doxygen then modify it with version instead of
      modifying asterisk-ng-doxygen directly.  Updated clean
      targets as well.
      
      Updated /.gitignore and doc/.gitignore.
      
      Change-Id: I38712d3e334fa4baec19d30d05de8c6f28137622
      cf637f25
  7. Apr 22, 2015
  8. Apr 15, 2015
  9. Apr 14, 2015
  10. Apr 12, 2015
    • Matt Jordan's avatar
      .gitignore: Ignore tarballs (*.gz) · d6605b3c
      Matt Jordan authored
      This patch updates the root .gitignore file to ignore files with a .gz
      extension. This will cause git to ignore downloaded sound tarballs in
      the the sounds/ directory.
      
      Change-Id: Ie84f085cc0fa51262209e7bfc1b1ba8c04a1ef59
      d6605b3c
    • George Joseph's avatar
      Add .gitignore and .gitreview files · b35e184d
      George Joseph authored
      Add the .gitignore and .gitreview files to the asterisk repo.
      
      NB:  You can add local ignores to the .git/info/exclude file
      without having to do a commit.
      
      Common ignore patterns are in the top-level .gitignore file.
      Subdirectory-specific ignore patterns are in their own .gitignore
      files.
      
      Change-Id: I842a1588ff27d8a0189f12d597f0a7af033d6c69
      Tested-by: George Joseph
      b35e184d
Loading